Re: [PATCH v2] drivers/hvc: add missing __devexit_p()

[Benjamin Herrenschmidt]

On Mon, 2009-05-18 at 03:44 -0400, Mike Frysinger wrote:
 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 vap...@gentoo.org
 CC: linuxppc-...@ozlabs.org
 ---
 v2

Thanks. Andrew, I'm picking this one up.

Cheers,
Ben.

   - include all hvc files
 
  drivers/char/hvc_iseries.c |2 +-
  drivers/char/hvc_vio.c |2 +-
  drivers/char/hvcs.c|2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c
 index 449727b..936d05b 100644
 --- a/drivers/char/hvc_iseries.c
 +++ b/drivers/char/hvc_iseries.c
 @@ -241,7 +241,7 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev)
  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 --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
 index bd62dc8..c72b994 100644
 --- a/drivers/char/hvc_vio.c
 +++ b/drivers/char/hvc_vio.c
 @@ -113,7 +113,7 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev)
  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 --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
 index c76bccf..2724d62 100644
 --- a/drivers/char/hvcs.c
 +++ b/drivers/char/hvcs.c
 @@ -868,7 +868,7 @@ static int __devexit hvcs_remove(struct vio_dev *dev)
  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,

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

[PATCH v2] drivers/hvc: add missing __devexit_p()

[Mike Frysinger]

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 vap...@gentoo.org
CC: linuxppc-dev@ozlabs.org
---
v2
- include all hvc files

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

diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c
index 449727b..936d05b 100644
--- a/drivers/char/hvc_iseries.c
+++ b/drivers/char/hvc_iseries.c
@@ -241,7 +241,7 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev)
 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 --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
index bd62dc8..c72b994 100644
--- a/drivers/char/hvc_vio.c
+++ b/drivers/char/hvc_vio.c
@@ -113,7 +113,7 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev)
 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 --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
index c76bccf..2724d62 100644
--- a/drivers/char/hvcs.c
+++ b/drivers/char/hvcs.c
@@ -868,7 +868,7 @@ static int __devexit hvcs_remove(struct vio_dev *dev)
 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,
-- 
1.6.3

___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev