Patchwork [1/1] drivers/hvc: add missing __devexit_p()

login
register
mail settings
Submitter Andrew Morton
Date June 10, 2009, 7:42 p.m.
Message ID <200906101942.n5AJgVPU030230@imap1.linux-foundation.org>
Download mbox | patch
Permalink /patch/28489/
State Accepted
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Andrew Morton - June 10, 2009, 7:42 p.m.
From: Mike Frysinger <vapier@gentoo.org>

The remove function uses __devexit, so the .remove assignment needs
__devexit_p() to fix a build error with hotplug disabled.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Milton Miller <miltonm@bga.com>
Cc: Anton Blanchard <anton@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/char/hvc_iseries.c |    2 +-
 drivers/char/hvc_vio.c     |    2 +-
 drivers/char/hvcs.c        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff -puN drivers/char/hvc_iseries.c~drivers-hvc-add-missing-__devexit_p drivers/char/hvc_iseries.c
--- a/drivers/char/hvc_iseries.c~drivers-hvc-add-missing-__devexit_p
+++ a/drivers/char/hvc_iseries.c
@@ -241,7 +241,7 @@  static int __devexit hvc_vio_remove(stru
 static struct vio_driver hvc_vio_driver = {
 	.id_table	= hvc_driver_table,
 	.probe		= hvc_vio_probe,
-	.remove		= hvc_vio_remove,
+	.remove		= __devexit_p(hvc_vio_remove),
 	.driver		= {
 		.name	= hvc_driver_name,
 		.owner	= THIS_MODULE,
diff -puN drivers/char/hvc_vio.c~drivers-hvc-add-missing-__devexit_p drivers/char/hvc_vio.c
--- a/drivers/char/hvc_vio.c~drivers-hvc-add-missing-__devexit_p
+++ a/drivers/char/hvc_vio.c
@@ -113,7 +113,7 @@  static int __devexit hvc_vio_remove(stru
 static struct vio_driver hvc_vio_driver = {
 	.id_table	= hvc_driver_table,
 	.probe		= hvc_vio_probe,
-	.remove		= hvc_vio_remove,
+	.remove		= __devexit_p(hvc_vio_remove),
 	.driver		= {
 		.name	= hvc_driver_name,
 		.owner	= THIS_MODULE,
diff -puN drivers/char/hvcs.c~drivers-hvc-add-missing-__devexit_p drivers/char/hvcs.c
--- a/drivers/char/hvcs.c~drivers-hvc-add-missing-__devexit_p
+++ a/drivers/char/hvcs.c
@@ -868,7 +868,7 @@  static int __devexit hvcs_remove(struct 
 static struct vio_driver hvcs_vio_driver = {
 	.id_table	= hvcs_driver_table,
 	.probe		= hvcs_probe,
-	.remove		= hvcs_remove,
+	.remove		= __devexit_p(hvcs_remove),
 	.driver		= {
 		.name	= hvcs_driver_name,
 		.owner	= THIS_MODULE,