Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d541b22a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6f21d806 d130d971

drivers/hwmon/ad7414.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static inline int ad7414_write(struct i2c_client *client, u8 reg, u8 value) 
	return i2c_smbus_write_byte_data(client, reg, value);

}



struct ad7414_data *ad7414_update_device(struct device *dev)

static struct ad7414_data *ad7414_update_device(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct ad7414_data *data = i2c_get_clientdata(client);

drivers/hwmon/atxp1.c

+9 −9
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");

MODULE_VERSION("0.6.2");

MODULE_VERSION("0.6.3");

MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");



#define ATXP1_VID	0x00
@@ -289,7 +289,8 @@ static int atxp1_detect(struct i2c_client *new_client, int kind, 
	if (!((i2c_smbus_read_byte_data(new_client, 0x3e) == 0) &&

	     (i2c_smbus_read_byte_data(new_client, 0x3f) == 0) &&

	     (i2c_smbus_read_byte_data(new_client, 0xfe) == 0) &&

	     (i2c_smbus_read_byte_data(new_client, 0xff) == 0) )) {

	     (i2c_smbus_read_byte_data(new_client, 0xff) == 0)))

		return -ENODEV;



	/* No vendor ID, now checking if registers 0x10,0x11 (non-existent)

	 * showing the same as register 0x00 */
@@ -298,7 +299,6 @@ static int atxp1_detect(struct i2c_client *new_client, int kind, 
	if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) &&

	      (i2c_smbus_read_byte_data(new_client, 0x11) == temp)))

		return -ENODEV;

	}



	/* Get VRM */

	temp = vid_which_vrm();

drivers/hwmon/it87.c

+2 −2
Original line number Diff line number Diff line
@@ -273,10 +273,10 @@ struct it87_data { 
static inline int has_16bit_fans(const struct it87_data *data)

{

	/* IT8705F Datasheet 0.4.1, 3h == Version G.

	   IT8712F Datasheet 0.9.1, section 8.3.5 indicates 7h == Version I.

	   IT8712F Datasheet 0.9.1, section 8.3.5 indicates 8h == Version J.

	   These are the first revisions with 16bit tachometer support. */

	return (data->type == it87 && data->revision >= 0x03)

	    || (data->type == it8712 && data->revision >= 0x07)

	    || (data->type == it8712 && data->revision >= 0x08)

	    || data->type == it8716

	    || data->type == it8718;

}