summaryrefslogtreecommitdiff
path: root/drivers/staging/media
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 18:20:53 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 23:09:57 (GMT)
commit01f6f49b0abe4c0ca39e7af577f3dd889f0c6d78 (patch)
tree1f1bedda59917285dff88c2e8ac1aa567dff2163 /drivers/staging/media
parent79fc8d891bf746c0f4da88f6fcca0f2cbcf21094 (diff)
downloadlinux-fsl-qoriq-01f6f49b0abe4c0ca39e7af577f3dd889f0c6d78.tar.xz
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>
Diffstat (limited to 'drivers/staging/media')
-rw-r--r--drivers/staging/media/lirc/lirc_parallel.c2
-rw-r--r--drivers/staging/media/lirc/lirc_serial.c2
-rw-r--r--drivers/staging/media/lirc/lirc_sir.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/media/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c
index dd2bca7..610230f 100644
--- 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 97ef670..002f325 100644
--- 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 4afc3b4..420e3df 100644
--- 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,