[lm-sensors] [PATCH] hwmon: Fix more __devexit_p glitches

[lm-sensors] [PATCH] hwmon: Fix more __devexit_p glitches

[Jean Delvare]

Make sure __devexit and devexit_p() match in all hwmon drivers.
Suggested by a similar fix from Mike Frysinger.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
---
 drivers/hwmon/f71882fg.c |    2 +-
 drivers/hwmon/sht15.c    |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

--- linux-2.6.30-rc8.orig/drivers/hwmon/f71882fg.c	2009-06-03 10:55:43.000000000 +0200
+++ linux-2.6.30-rc8/drivers/hwmon/f71882fg.c	2009-06-04 09:02:47.000000000 +0200
@@ -253,7 +253,7 @@ static struct platform_driver f71882fg_d
 		.name	= DRVNAME,
 	},
 	.probe		= f71882fg_probe,
-	.remove		= __devexit_p(f71882fg_remove),
+	.remove		= f71882fg_remove,
 };
 
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
--- linux-2.6.30-rc8.orig/drivers/hwmon/sht15.c	2009-04-15 08:40:49.000000000 +0200
+++ linux-2.6.30-rc8/drivers/hwmon/sht15.c	2009-06-04 09:25:30.000000000 +0200
@@ -627,35 +627,35 @@ static struct platform_driver sht_driver
 			.owner = THIS_MODULE,
 		},
 		.probe = sht15_probe,
-		.remove = sht15_remove,
+		.remove = __devexit_p(sht15_remove),
 	}, {
 		.driver = {
 			.name = "sht11",
 			.owner = THIS_MODULE,
 		},
 		.probe = sht15_probe,
-		.remove = sht15_remove,
+		.remove = __devexit_p(sht15_remove),
 	}, {
 		.driver = {
 			.name = "sht15",
 			.owner = THIS_MODULE,
 		},
 		.probe = sht15_probe,
-		.remove = sht15_remove,
+		.remove = __devexit_p(sht15_remove),
 	}, {
 		.driver = {
 			.name = "sht71",
 			.owner = THIS_MODULE,
 		},
 		.probe = sht15_probe,
-		.remove = sht15_remove,
+		.remove = __devexit_p(sht15_remove),
 	}, {
 		.driver = {
 			.name = "sht75",
 			.owner = THIS_MODULE,
 		},
 		.probe = sht15_probe,
-		.remove = sht15_remove,
+		.remove = __devexit_p(sht15_remove),
 	},
 };
 

-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] [PATCH] hwmon: Fix more __devexit_p glitches

[Hans de Goede]

Hi,

On 06/04/2009 09:30 AM, Jean Delvare wrote:
> Make sure __devexit and devexit_p() match in all hwmon drivers.
> Suggested by a similar fix from Mike Frysinger.
>
> Signed-off-by: Jean Delvare<khali@linux-fr.org>


Looks good to me.

Regards,

Hans


> Cc: Hans de Goede<hdegoede@redhat.com>
> Cc: Jonathan Cameron<jic23@cam.ac.uk>
> ---
>   drivers/hwmon/f71882fg.c |    2 +-
>   drivers/hwmon/sht15.c    |   10 +++++-----
>   2 files changed, 6 insertions(+), 6 deletions(-)
>
> --- linux-2.6.30-rc8.orig/drivers/hwmon/f71882fg.c	2009-06-03 10:55:43.000000000 +0200
> +++ linux-2.6.30-rc8/drivers/hwmon/f71882fg.c	2009-06-04 09:02:47.000000000 +0200
> @@ -253,7 +253,7 @@ static struct platform_driver f71882fg_d
>   		.name	= DRVNAME,
>   	},
>   	.probe		= f71882fg_probe,
> -	.remove		= __devexit_p(f71882fg_remove),
> +	.remove		= f71882fg_remove,
>   };
>
>   static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
> --- linux-2.6.30-rc8.orig/drivers/hwmon/sht15.c	2009-04-15 08:40:49.000000000 +0200
> +++ linux-2.6.30-rc8/drivers/hwmon/sht15.c	2009-06-04 09:25:30.000000000 +0200
> @@ -627,35 +627,35 @@ static struct platform_driver sht_driver
>   			.owner = THIS_MODULE,
>   		},
>   		.probe = sht15_probe,
> -		.remove = sht15_remove,
> +		.remove = __devexit_p(sht15_remove),
>   	}, {
>   		.driver = {
>   			.name = "sht11",
>   			.owner = THIS_MODULE,
>   		},
>   		.probe = sht15_probe,
> -		.remove = sht15_remove,
> +		.remove = __devexit_p(sht15_remove),
>   	}, {
>   		.driver = {
>   			.name = "sht15",
>   			.owner = THIS_MODULE,
>   		},
>   		.probe = sht15_probe,
> -		.remove = sht15_remove,
> +		.remove = __devexit_p(sht15_remove),
>   	}, {
>   		.driver = {
>   			.name = "sht71",
>   			.owner = THIS_MODULE,
>   		},
>   		.probe = sht15_probe,
> -		.remove = sht15_remove,
> +		.remove = __devexit_p(sht15_remove),
>   	}, {
>   		.driver = {
>   			.name = "sht75",
>   			.owner = THIS_MODULE,
>   		},
>   		.probe = sht15_probe,
> -		.remove = sht15_remove,
> +		.remove = __devexit_p(sht15_remove),
>   	},
>   };
>
>

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] [PATCH] hwmon: Fix more __devexit_p glitches

[Jim Cromie]

[-- Attachment #1.1: Type: text/plain, Size: 1079 bytes --]

On Thu, Jun 4, 2009 at 1:30 AM, Jean Delvare <khali@linux-fr.org> wrote:

> Make sure __devexit and devexit_p() match in all hwmon drivers.
> Suggested by a similar fix from Mike Frysinger.
>
> Signed-off-by: Jean Delvare <khali@linux-fr.org>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Jonathan Cameron <jic23@cam.ac.uk>
> ---
>  drivers/hwmon/f71882fg.c |    2 +-
>  drivers/hwmon/sht15.c    |   10 +++++-----
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> --- linux-2.6.30-rc8.orig/drivers/hwmon/f71882fg.c      2009-06-03
> 10:55:43.000000000 +0200
> +++ linux-2.6.30-rc8/drivers/hwmon/f71882fg.c   2009-06-04
> 09:02:47.000000000 +0200
> @@ -253,7 +253,7 @@ static struct platform_driver f71882fg_d
>                .name   = DRVNAME,
>        },
>        .probe          = f71882fg_probe,
> -       .remove         = __devexit_p(f71882fg_remove),
> +       .remove         = f71882fg_remove,
>  };
>


I think that one is reversed, certainly vs following.



> -               .remove = sht15_remove,
> +               .remove = __devexit_p(sht15_remove),
>
>

[-- Attachment #1.2: Type: text/html, Size: 1707 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] [PATCH] hwmon: Fix more __devexit_p glitches

[Jean Delvare]

On Wed, 10 Jun 2009 10:11:49 -0600, Jim Cromie wrote:
> On Thu, Jun 4, 2009 at 1:30 AM, Jean Delvare <khali@linux-fr.org> wrote:
> 
> > Make sure __devexit and devexit_p() match in all hwmon drivers.
> > Suggested by a similar fix from Mike Frysinger.
> >
> > Signed-off-by: Jean Delvare <khali@linux-fr.org>
> > Cc: Hans de Goede <hdegoede@redhat.com>
> > Cc: Jonathan Cameron <jic23@cam.ac.uk>
> > ---
> >  drivers/hwmon/f71882fg.c |    2 +-
> >  drivers/hwmon/sht15.c    |   10 +++++-----
> >  2 files changed, 6 insertions(+), 6 deletions(-)
> >
> > --- linux-2.6.30-rc8.orig/drivers/hwmon/f71882fg.c      2009-06-03
> > 10:55:43.000000000 +0200
> > +++ linux-2.6.30-rc8/drivers/hwmon/f71882fg.c   2009-06-04
> > 09:02:47.000000000 +0200
> > @@ -253,7 +253,7 @@ static struct platform_driver f71882fg_d
> >                .name   = DRVNAME,
> >        },
> >        .probe          = f71882fg_probe,
> > -       .remove         = __devexit_p(f71882fg_remove),
> > +       .remove         = f71882fg_remove,
> >  };
> >
> 
> 
> I think that one is reversed, certainly vs following.

This is on purpose. f71882fg_remove() is not marked with __devexit, so
there is no point in protecting references thereto with __devexit_p().

Note that, contrary to the other way, this one does not cause build
errors. It's just needlessly complex, and confusing for the reader.

> > -               .remove = sht15_remove,
> > +               .remove = __devexit_p(sht15_remove),
> >
> >


-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors