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

Commit 8e8f9289 authored by Grant Coady's avatar Grant Coady Committed by Greg Kroah-Hartman
Browse files

[PATCH] I2C: adm9240 driver cleanup 



This patch adds an info print of detected VRM stolen from Sebastian
Witt's atxp1 sriver.  ADM9240 already has vrm accessor removed.

Write no-op and whitespace fixes removed :)

Couple of comments changed, tested on 2.6.11.9.

Signed-off-by: default avatarGrant Coady <gcoady@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 937df8df

drivers/i2c/chips/adm9240.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -165,7 +165,7 @@ struct adm9240_data { 
	s8 temp_high;		/* rw	temp1_max */

	s8 temp_high;		/* rw	temp1_max */

	s8 temp_hyst;		/* rw	temp1_max_hyst */

	s8 temp_hyst;		/* rw	temp1_max_hyst */

	u16 alarms;		/* ro	alarms */

	u16 alarms;		/* ro	alarms */

	u8 aout;		/* rw	analog_out */

	u8 aout;		/* rw	aout_output */

	u8 vid;			/* ro	vid */

	u8 vid;			/* ro	vid */

	u8 vrm;			/* --	vrm set on startup, no accessor */

	u8 vrm;			/* --	vrm set on startup, no accessor */

};

};
@@ -192,7 +192,7 @@ static ssize_t show_##value(struct device *dev, char *buf) \ 
}

}

show_temp(temp_high, 1000);

show_temp(temp_high, 1000);

show_temp(temp_hyst, 1000);

show_temp(temp_hyst, 1000);

show_temp(temp, 500);

show_temp(temp, 500); /* 0.5'C per bit */





#define set_temp(value, reg)					\

#define set_temp(value, reg)					\

static ssize_t set_##value(struct device *dev, const char *buf,	\

static ssize_t set_##value(struct device *dev, const char *buf,	\
@@ -630,6 +630,9 @@ static void adm9240_init_client(struct i2c_client *client) 




	data->vrm = i2c_which_vrm(); /* need this to report vid as mV */

	data->vrm = i2c_which_vrm(); /* need this to report vid as mV */





	dev_info(&client->dev, "Using VRM: %d.%d\n", data->vrm / 10,

			data->vrm % 10);



	if (conf & 1) { /* measurement cycle running: report state */

	if (conf & 1) { /* measurement cycle running: report state */





		dev_info(&client->dev, "status: config 0x%02x mode %u\n",

		dev_info(&client->dev, "status: config 0x%02x mode %u\n",