[PATCH 1/2] hwmon: (vexpress) Remove __devexit and __devexit_p

[PATCH 1/2] hwmon: (vexpress) Remove __devexit and __devexit_p

[Guenter Roeck]

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 drivers/hwmon/vexpress.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/vexpress.c b/drivers/hwmon/vexpress.c
index 59fd126..86d7f6d 100644
--- a/drivers/hwmon/vexpress.c
+++ b/drivers/hwmon/vexpress.c
@@ -196,7 +196,7 @@ error:
 	return err;
 }
 
-static int __devexit vexpress_hwmon_remove(struct platform_device *pdev)
+static int vexpress_hwmon_remove(struct platform_device *pdev)
 {
 	struct vexpress_hwmon_data *data = platform_get_drvdata(pdev);
 	const struct of_device_id *match;
@@ -213,7 +213,7 @@ static int __devexit vexpress_hwmon_remove(struct platform_device *pdev)
 
 static struct platform_driver vexpress_hwmon_driver = {
 	.probe = vexpress_hwmon_probe,
-	.remove = __devexit_p(vexpress_hwmon_remove),
+	.remove = vexpress_hwmon_remove,
 	.driver	= {
 		.name = DRVNAME,
 		.owner = THIS_MODULE,
-- 
1.7.9.7

[PATCH 2/2] hwmon: (vexpress) Fix build error seen if CONFIG_OF_DEVICE is not set

[Guenter Roeck]

Fix:
vexpress.c: In function ‘vexpress_hwmon_name_show’:
vexpress.c:34:2: error: implicit declaration of function
‘of_get_property’ [-Werror=implicit-function-declaration]
vexpress.c:34:27: warning: initialization makes pointer from integer
without a cast [enabled by default]
vexpress.c: In function ‘vexpress_hwmon_label_show’:
vexpress.c:43:22: warning: initialization makes pointer from integer
without a cast [enabled by default]

Seen if CONFIG_OF_DEVICE is not defined. of_get_property is declared in
of.h which is only included by of_device.h if CONFIG_OF_DEVICE is defined.
of.h needs to be included directly.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 drivers/hwmon/vexpress.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/hwmon/vexpress.c b/drivers/hwmon/vexpress.c
index 86d7f6d..d867e6b 100644
--- a/drivers/hwmon/vexpress.c
+++ b/drivers/hwmon/vexpress.c
@@ -19,6 +19,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/vexpress.h>
-- 
1.7.9.7

Re: [PATCH 2/2] hwmon: (vexpress) Fix build error seen if CONFIG_OF_DEVICE is not set

[Pawel Moll]

On Mon, 2012-12-31 at 08:13 +0000, Guenter Roeck wrote:
> Fix:
> vexpress.c: In function ‘vexpress_hwmon_name_show’:
> vexpress.c:34:2: error: implicit declaration of function
> ‘of_get_property’ [-Werror=implicit-function-declaration]
> vexpress.c:34:27: warning: initialization makes pointer from integer
> without a cast [enabled by default]
> vexpress.c: In function ‘vexpress_hwmon_label_show’:
> vexpress.c:43:22: warning: initialization makes pointer from integer
> without a cast [enabled by default]
> 
> Seen if CONFIG_OF_DEVICE is not defined. of_get_property is declared in
> of.h which is only included by of_device.h if CONFIG_OF_DEVICE is defined.
> of.h needs to be included directly.
> 
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>

Thanks, Guenter! (of course it's way too late for Acked-by: Pawel Moll
<pawel.moll@arm.com>)

Pawel