diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-27 14:44:11 (GMT) |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-27 14:44:11 (GMT) |
commit | a44dca1717ce2c2381339e21c07d1731a63a7888 (patch) | |
tree | 3d0b3bd26492f9fa1f1f1c1ad838315b266da7c1 /drivers/staging/media | |
parent | 30ebc5e44d057a1619ad63fe32c8c1670c37c4b8 (diff) | |
parent | a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff) | |
download | linux-a44dca1717ce2c2381339e21c07d1731a63a7888.tar.xz |
Merge tag 'v3.8-rc1' into staging/for_v3.9
Linux 3.8-rc1
* tag 'v3.8-rc1': (10696 commits)
Linux 3.8-rc1
Revert "nfsd: warn on odd reply state in nfsd_vfs_read"
ARM: dts: fix duplicated build target and alphabetical sort out for exynos
dm stripe: add WRITE SAME support
dm: remove map_info
dm snapshot: do not use map_context
dm thin: dont use map_context
dm raid1: dont use map_context
dm flakey: dont use map_context
dm raid1: rename read_record to bio_record
dm: move target request nr to dm_target_io
dm snapshot: use per_bio_data
dm verity: use per_bio_data
dm raid1: use per_bio_data
dm: introduce per_bio_data
dm kcopyd: add WRITE SAME support to dm_kcopyd_zero
dm linear: add WRITE SAME support
dm: add WRITE SAME support
dm: prepare to support WRITE SAME
dm ioctl: use kmalloc if possible
...
Conflicts:
MAINTAINERS
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 0af8917..e33b7f5 100644 --- a/drivers/staging/media/dt3155v4l/dt3155v4l.c +++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c @@ -720,7 +720,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); @@ -838,7 +838,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; @@ -879,7 +879,7 @@ out: return 0; } -static void __devexit +static void dt3155_free_coherent(struct device *dev) { struct dma_coherent_mem *mem = dev->dma_mem; @@ -893,7 +893,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; @@ -958,7 +958,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); @@ -985,7 +985,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 139920c2..41d110f 100644 --- a/drivers/staging/media/lirc/lirc_parallel.c +++ b/drivers/staging/media/lirc/lirc_parallel.c @@ -577,12 +577,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; } @@ -600,7 +600,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 513b75e..af08e67 100644 --- a/drivers/staging/media/lirc/lirc_serial.c +++ b/drivers/staging/media/lirc/lirc_serial.c @@ -835,7 +835,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; @@ -916,7 +916,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); @@ -1137,7 +1137,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 9a88f05..63a554c 100644 --- a/drivers/staging/media/lirc/lirc_sir.c +++ b/drivers/staging/media/lirc/lirc_sir.c @@ -1213,19 +1213,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); |