summaryrefslogtreecommitdiff
path: root/drivers/staging/media
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:27:10 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 15:09:58 -0800
commit6dd1119528d68e6f3a04874792048fc7be7611d7 (patch)
tree8a8841e5866bab1c895062cc32e071234f903e31 /drivers/staging/media
parent2a91a6d1422f6dc3cb27689e18e16b8c98ec1c73 (diff)
downloadlinux-3.10-6dd1119528d68e6f3a04874792048fc7be7611d7.tar.gz
linux-3.10-6dd1119528d68e6f3a04874792048fc7be7611d7.tar.bz2
linux-3.10-6dd1119528d68e6f3a04874792048fc7be7611d7.zip
staging: lirc: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: linux-media@vger.kernel.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 f600c67b326..ec14bc81851 100644
--- a/drivers/staging/media/lirc/lirc_parallel.c
+++ b/drivers/staging/media/lirc/lirc_parallel.c
@@ -588,7 +588,7 @@ static int lirc_parallel_probe(struct platform_device *dev)
return 0;
}
-static int __devexit lirc_parallel_remove(struct platform_device *dev)
+static int lirc_parallel_remove(struct platform_device *dev)
{
return 0;
}
diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index e182da4a979..71e3bf2937f 100644
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -927,7 +927,7 @@ exit_free_irq:
return result;
}
-static int __devexit lirc_serial_remove(struct platform_device *dev)
+static int lirc_serial_remove(struct platform_device *dev)
{
free_irq(irq, (void *)&hardware);
diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c
index 9c211e72ea5..a45799874a2 100644
--- a/drivers/staging/media/lirc/lirc_sir.c
+++ b/drivers/staging/media/lirc/lirc_sir.c
@@ -1223,7 +1223,7 @@ static int lirc_sir_probe(struct platform_device *dev)
return 0;
}
-static int __devexit lirc_sir_remove(struct platform_device *dev)
+static int lirc_sir_remove(struct platform_device *dev)
{
return 0;
}