summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media
diff options
context:
space:
mode:
authorBill Pemberton2012-11-19 19:22:15 +0100
committerGreg Kroah-Hartman2012-11-22 00:09:57 +0100
commitfd8413a2b8328801133e95b58d751bfe48b34303 (patch)
treeaa7a841d32ec378143134681301d0160d10f8b0f /drivers/staging/media
parentstaging: lirc: remove use of __devexit_p (diff)
downloadkernel-qcow2-linux-fd8413a2b8328801133e95b58d751bfe48b34303.tar.gz
kernel-qcow2-linux-fd8413a2b8328801133e95b58d751bfe48b34303.tar.xz
kernel-qcow2-linux-fd8413a2b8328801133e95b58d751bfe48b34303.zip
staging: lirc: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit 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 610230f535bf..f600c67b326f 100644
--- a/drivers/staging/media/lirc/lirc_parallel.c
+++ b/drivers/staging/media/lirc/lirc_parallel.c
@@ -583,7 +583,7 @@ static struct lirc_driver driver = {
static struct platform_device *lirc_parallel_dev;
-static int __devinit lirc_parallel_probe(struct platform_device *dev)
+static int lirc_parallel_probe(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 002f3253b9ef..e182da4a9796 100644
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -841,7 +841,7 @@ static int hardware_init_port(void)
return 0;
}
-static int __devinit lirc_serial_probe(struct platform_device *dev)
+static int lirc_serial_probe(struct platform_device *dev)
{
int i, nlow, nhigh, result;
diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c
index 420e3df466d5..9c211e72ea5b 100644
--- a/drivers/staging/media/lirc/lirc_sir.c
+++ b/drivers/staging/media/lirc/lirc_sir.c
@@ -1218,7 +1218,7 @@ static int init_lirc_sir(void)
return 0;
}
-static int __devinit lirc_sir_probe(struct platform_device *dev)
+static int lirc_sir_probe(struct platform_device *dev)
{
return 0;
}