[lm-sensors] [PATCH 1/3] hwmon: adm9240 updates

[lm-sensors] [PATCH 1/3] hwmon: adm9240 updates

[Grant Coady]

hwmon: adm9240 update 1/3: whitespace

Signed-off-by: Grant Coady <gcoady@gmail.com>

---
 adm9240.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

--- linux-2.6.14-rc1/drivers/hwmon/adm9240.c	2005-09-13 18:36:27.000000000 +1000
+++ linux-2.6.14-rc1b/drivers/hwmon/adm9240.c	2005-09-14 07:07:08.000000000 +1000
@@ -350,7 +350,7 @@
 			"to %u\n", nr + 1, 1 << old, 1 << fan_div);
 }
 
-/* 
+/*
  * set fan speed low limit:
  *
  * - value is zero: disable fan speed low limit alarm
@@ -449,7 +449,8 @@
 show_fan_offset(2);
 
 /* alarms */
-static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_alarms(struct device *dev,
+		struct device_attribute *attr, char *buf)
 {
 	struct adm9240_data *data = adm9240_update_device(dev);
 	return sprintf(buf, "%u\n", data->alarms);
@@ -457,7 +458,8 @@
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 /* vid */
-static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_vid(struct device *dev,
+		struct device_attribute *attr, char *buf)
 {
 	struct adm9240_data *data = adm9240_update_device(dev);
 	return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
@@ -465,13 +467,15 @@
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
 /* analog output */
-static ssize_t show_aout(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_aout(struct device *dev,
+		struct device_attribute *attr, char *buf)
 {
 	struct adm9240_data *data = adm9240_update_device(dev);
 	return sprintf(buf, "%d\n", AOUT_FROM_REG(data->aout));
 }
 
-static ssize_t set_aout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t set_aout(struct device *dev,
+		struct device_attribute *attr, const char *buf, size_t count)
 {
 	struct i2c_client *client = to_i2c_client(dev);
 	struct adm9240_data *data = i2c_get_clientdata(client);
@@ -486,7 +490,8 @@
 static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout);
 
 /* chassis_clear */
-static ssize_t chassis_clear(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t chassis_clear(struct device *dev,
+		struct device_attribute *attr, const char *buf, size_t count)
 {
 	struct i2c_client *client = to_i2c_client(dev);
 	unsigned long val = simple_strtol(buf, NULL, 10);

[lm-sensors] [PATCH 1/3] hwmon: adm9240 updates

[Jean Delvare]

Hi Grant,

> hwmon: adm9240 update 1/3: whitespace
> 
> Signed-off-by: Grant Coady <gcoady@gmail.com>

I see that your latter series had only two patches, this one not being
there anymore. It looks correct to me though. Do you still want me to
apply it, or not?

-- 
Jean Delvare

[lm-sensors] [PATCH 1/3] hwmon: adm9240 updates

[Grant Coady]

Hi Jean,
On Wed, 21 Sep 2005 22:38:52 +0200, Jean Delvare <khali@linux-fr.org> wrote:

>Hi Grant,
>
>> hwmon: adm9240 update 1/3: whitespace
>> 
>> Signed-off-by: Grant Coady <gcoady@gmail.com>
>
>I see that your latter series had only two patches, this one not being
>there anymore. It looks correct to me though. Do you still want me to
>apply it, or not?

GregKH already took the later two on 2005-09-17, was CC: to you, 
and yes. they apply after this 2005-09-10 whitespace patch.  

I thought I did wrong thing numbering 1..3 as 1/3 already gone 
to Greg?  Just my normal scattered confusion ;)  Sorry.

Cheers,
Grant.

[lm-sensors] [PATCH 1/3] hwmon: adm9240 updates

[Greg KH]

On Wed, Sep 14, 2005 at 08:49:42AM +1000, Grant Coady wrote:
> 
> hwmon: adm9240 update 1/3: whitespace
> 
> Signed-off-by: Grant Coady <gcoady@gmail.com>

Hm, Jean pointed out that I've missed this patch.  Yet I applied another
patch called 1/3 which is a bit confusing...  So, could you just verify
that I've accepted all of the patches that you want me to?  And if not,
care to resend them to me?

thanks,

greg k-h

[lm-sensors] [PATCH 1/3] hwmon: adm9240 updates

[Grant Coady]

Hi Greg, 
On Thu, 22 Sep 2005 03:33:04 -0700, Greg KH <greg@kroah.com> wrote:

>On Wed, Sep 14, 2005 at 08:49:42AM +1000, Grant Coady wrote:
>> 
>> hwmon: adm9240 update 1/3: whitespace
>> 
>> Signed-off-by: Grant Coady <gcoady@gmail.com>
>
>Hm, Jean pointed out that I've missed this patch.  Yet I applied another
>patch called 1/3 which is a bit confusing...  So, could you just verify
>that I've accepted all of the patches that you want me to?  And if not,
>care to resend them to me?

Nothing missing, 2.6.14-rc2-mm1 looks fine, works as well, thank you.  

Sorry for confusion, patches 2 and 3 got changed after review then 
l-k release changed and I got confused as to what to do with numbering.

Cheers,
Grant.



Grant.

[lm-sensors] [PATCH 1/3] hwmon: adm9240 updates

[Jean Delvare]

Hi Grant, Greg,

> Nothing missing, 2.6.14-rc2-mm1 looks fine, works as well, thank
> you.

I just double-checked, the patch I had pointed Greg to is NOT in
2.6.14-rc2-mm1.

Nevermind, just forget about it for now, I'll respin it and include it
in my next batch of patches to Greg.

-- 
Jean Delvare

[lm-sensors] [PATCH 1/3] hwmon: adm9240 updates

[Grant Coady]

On Wed, 21 Sep 2005 22:38:52 +0200, Jean Delvare <khali@linux-fr.org> wrote:

>Hi Grant,
>
>> hwmon: adm9240 update 1/3: whitespace
>> 
>> Signed-off-by: Grant Coady <gcoady@gmail.com>
>
>I see that your latter series had only two patches, this one not being
>there anymore. It looks correct to me though. Do you still want me to
>apply it, or not?

Please, I thought you already had, on Sept 10?

Thanks,
Grant.