Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
hwmon: (ad7414) Make ad7414_update_device() static
hwmon: (it87) Fix fan tachometer reading in IT8712F rev 0x7 (I)
hwmon: (atxp1) Fix device detection logic
+12
-12
+1
-1
drivers/hwmon/ad7414.c
+1
-1
drivers/hwmon/ad7414.c
···
69
69
return i2c_smbus_write_byte_data(client, reg, value);
70
70
}
71
71
72
-
struct ad7414_data *ad7414_update_device(struct device *dev)
72
+
static struct ad7414_data *ad7414_update_device(struct device *dev)
73
73
{
74
74
struct i2c_client *client = to_i2c_client(dev);
75
75
struct ad7414_data *data = i2c_get_clientdata(client);
+9
-9
drivers/hwmon/atxp1.c
+9
-9
drivers/hwmon/atxp1.c
···
31
31
32
32
MODULE_LICENSE("GPL");
33
33
MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
34
-
MODULE_VERSION("0.6.2");
34
+
MODULE_VERSION("0.6.3");
35
35
MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
36
36
37
37
#define ATXP1_VID 0x00
···
289
289
if (!((i2c_smbus_read_byte_data(new_client, 0x3e) == 0) &&
290
290
(i2c_smbus_read_byte_data(new_client, 0x3f) == 0) &&
291
291
(i2c_smbus_read_byte_data(new_client, 0xfe) == 0) &&
292
-
(i2c_smbus_read_byte_data(new_client, 0xff) == 0) )) {
292
+
(i2c_smbus_read_byte_data(new_client, 0xff) == 0)))
293
+
return -ENODEV;
293
294
294
-
/* No vendor ID, now checking if registers 0x10,0x11 (non-existent)
295
-
* showing the same as register 0x00 */
296
-
temp = i2c_smbus_read_byte_data(new_client, 0x00);
295
+
/* No vendor ID, now checking if registers 0x10,0x11 (non-existent)
296
+
* showing the same as register 0x00 */
297
+
temp = i2c_smbus_read_byte_data(new_client, 0x00);
297
298
298
-
if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) &&
299
-
(i2c_smbus_read_byte_data(new_client, 0x11) == temp) ))
300
-
return -ENODEV;
301
-
}
299
+
if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) &&
300
+
(i2c_smbus_read_byte_data(new_client, 0x11) == temp)))
301
+
return -ENODEV;
302
302
303
303
/* Get VRM */
304
304
temp = vid_which_vrm();
+2
-2
drivers/hwmon/it87.c
+2
-2
drivers/hwmon/it87.c
···
273
273
static inline int has_16bit_fans(const struct it87_data *data)
274
274
{
275
275
/* IT8705F Datasheet 0.4.1, 3h == Version G.
276
-
IT8712F Datasheet 0.9.1, section 8.3.5 indicates 7h == Version I.
276
+
IT8712F Datasheet 0.9.1, section 8.3.5 indicates 8h == Version J.
277
277
These are the first revisions with 16bit tachometer support. */
278
278
return (data->type == it87 && data->revision >= 0x03)
279
-
|| (data->type == it8712 && data->revision >= 0x07)
279
+
|| (data->type == it8712 && data->revision >= 0x08)
280
280
|| data->type == it8716
281
281
|| data->type == it8718;
282
282
}