diff options
Diffstat (limited to 'drivers/staging/media')
-rw-r--r-- | drivers/staging/media/dt3155v4l/dt3155v4l.c | 12 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_parallel.c | 6 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_serial.c | 6 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_sir.c | 6 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/core.c | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c index 2e7b711..2389103 100644 --- a/drivers/staging/media/dt3155v4l/dt3155v4l.c +++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c @@ -718,7 +718,7 @@ static const struct v4l2_ioctl_ops dt3155_ioctl_ops = { */ }; -static int __devinit +static int dt3155_init_board(struct pci_dev *pdev) { struct dt3155_priv *pd = pci_get_drvdata(pdev); @@ -836,7 +836,7 @@ struct dma_coherent_mem { unsigned long *bitmap; }; -static int __devinit +static int dt3155_alloc_coherent(struct device *dev, size_t size, int flags) { struct dma_coherent_mem *mem; @@ -877,7 +877,7 @@ out: return 0; } -static void __devexit +static void dt3155_free_coherent(struct device *dev) { struct dma_coherent_mem *mem = dev->dma_mem; @@ -891,7 +891,7 @@ dt3155_free_coherent(struct device *dev) kfree(mem); } -static int __devinit +static int dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id) { int err; @@ -956,7 +956,7 @@ err_video_device_alloc: return err; } -static void __devexit +static void dt3155_remove(struct pci_dev *pdev) { struct dt3155_priv *pd = pci_get_drvdata(pdev); @@ -983,7 +983,7 @@ static struct pci_driver pci_driver = { .name = DT3155_NAME, .id_table = pci_ids, .probe = dt3155_probe, - .remove = __devexit_p(dt3155_remove), + .remove = dt3155_remove, }; module_pci_driver(pci_driver); diff --git a/drivers/staging/media/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c index dd2bca7..ec14bc8 100644 --- a/drivers/staging/media/lirc/lirc_parallel.c +++ b/drivers/staging/media/lirc/lirc_parallel.c @@ -583,12 +583,12 @@ 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; } -static int __devexit lirc_parallel_remove(struct platform_device *dev) +static int lirc_parallel_remove(struct platform_device *dev) { return 0; } @@ -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..71e3bf2 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; @@ -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); @@ -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..a457998 100644 --- a/drivers/staging/media/lirc/lirc_sir.c +++ b/drivers/staging/media/lirc/lirc_sir.c @@ -1218,19 +1218,19 @@ 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; } -static int __devexit lirc_sir_remove(struct platform_device *dev) +static int lirc_sir_remove(struct platform_device *dev) { return 0; } 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, diff --git a/drivers/staging/media/solo6x10/core.c b/drivers/staging/media/solo6x10/core.c index 3ee9b12..fd83d6d 100644 --- a/drivers/staging/media/solo6x10/core.c +++ b/drivers/staging/media/solo6x10/core.c @@ -129,7 +129,7 @@ static void free_solo_dev(struct solo_dev *solo_dev) kfree(solo_dev); } -static int __devinit solo_pci_probe(struct pci_dev *pdev, +static int solo_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct solo_dev *solo_dev; @@ -284,7 +284,7 @@ fail_probe: return ret; } -static void __devexit solo_pci_remove(struct pci_dev *pdev) +static void solo_pci_remove(struct pci_dev *pdev) { struct solo_dev *solo_dev = pci_get_drvdata(pdev); |