staging: lirc: remove use of __devexit_p

CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/media/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c
index dd2bca7b56faf4b09afa5f3f6a1207d940507f6a..610230f535bf11211485db21d6c297c527362f43 100644 (file)
--- a/drivers/staging/media/lirc/lirc_parallel.c
+++ b/drivers/staging/media/lirc/lirc_parallel.c
@@ -606,7 +606,7 @@ static int lirc_parallel_resume(struct platform_device *dev)
 
 static struct platform_driver lirc_parallel_driver = {
        .probe  = lirc_parallel_probe,
-       .remove = __devexit_p(lirc_parallel_remove),
+       .remove = lirc_parallel_remove,
        .suspend        = lirc_parallel_suspend,
        .resume = lirc_parallel_resume,
        .driver = {

diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index 97ef67036e3f2befa84f148b45b471df36d22650..002f3253b9ef809ca298713fd5f599e2a2dbc912 100644 (file)
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -1148,7 +1148,7 @@ static int lirc_serial_resume(struct platform_device *dev)
 
 static struct platform_driver lirc_serial_driver = {
        .probe          = lirc_serial_probe,
-       .remove         = __devexit_p(lirc_serial_remove),
+       .remove         = lirc_serial_remove,
        .suspend        = lirc_serial_suspend,
        .resume         = lirc_serial_resume,
        .driver         = {

diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c
index 4afc3b4197385e4cda191553a5fcdfefca080988..420e3df466d5d0e8737e117cf66b8908763dbdb7 100644 (file)
--- a/drivers/staging/media/lirc/lirc_sir.c
+++ b/drivers/staging/media/lirc/lirc_sir.c
@@ -1230,7 +1230,7 @@ static int __devexit lirc_sir_remove(struct platform_device *dev)
 
 static struct platform_driver lirc_sir_driver = {
        .probe          = lirc_sir_probe,
-       .remove         = __devexit_p(lirc_sir_remove),
+       .remove         = lirc_sir_remove,
        .driver         = {
                .name   = "lirc_sir",
                .owner  = THIS_MODULE,