diff options
Diffstat (limited to 'sound')
224 files changed, 477 insertions, 857 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 3a10df6688ee..38590b322c54 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c @@ -241,7 +241,6 @@ static struct platform_driver pxa2xx_ac97_driver = { .remove = pxa2xx_ac97_remove, .driver = { .name = "pxa2xx-ac97", - .owner = THIS_MODULE, #ifdef CONFIG_PM_SLEEP .pm = &pxa2xx_ac97_pm_ops, #endif diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c index 023140504104..558618802000 100644 --- a/sound/atmel/abdac.c +++ b/sound/atmel/abdac.c @@ -588,7 +588,6 @@ static struct platform_driver atmel_abdac_driver = { .remove = atmel_abdac_remove, .driver = { .name = "atmel_abdac", - .owner = THIS_MODULE, .pm = ATMEL_ABDAC_PM_OPS, }, }; diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index cb44c74c9702..4f6b14d704f3 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -1203,7 +1203,6 @@ static struct platform_driver atmel_ac97c_driver = { .remove = atmel_ac97c_remove, .driver = { .name = "atmel_ac97c", - .owner = THIS_MODULE, .pm = ATMEL_AC97C_PM_OPS, }, }; diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c index 2a16c86a60b3..7ea53399404d 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c @@ -1220,7 +1220,6 @@ static struct platform_driver loopback_driver = { .remove = loopback_remove, .driver = { .name = SND_LOOPBACK_DRIVER, - .owner = THIS_MODULE, .pm = LOOPBACK_PM_OPS, }, }; diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index fab90bd2bd51..5d0dfb787cec 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -1162,7 +1162,6 @@ static struct platform_driver snd_dummy_driver = { .remove = snd_dummy_remove, .driver = { .name = SND_DUMMY_DRIVER, - .owner = THIS_MODULE, .pm = SND_DUMMY_PM_OPS, }, }; diff --git a/sound/drivers/ml403-ac97cr.c b/sound/drivers/ml403-ac97cr.c index 33ed76530d0b..bcca825a1c8d 100644 --- a/sound/drivers/ml403-ac97cr.c +++ b/sound/drivers/ml403-ac97cr.c @@ -1335,7 +1335,6 @@ static struct platform_driver snd_ml403_ac97cr_driver = { .remove = snd_ml403_ac97cr_remove, .driver = { .name = SND_ML403_AC97CR_DRIVER, - .owner = THIS_MODULE, }, }; diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c index 83014b83a44e..fed7e7e2177b 100644 --- a/sound/drivers/mpu401/mpu401.c +++ b/sound/drivers/mpu401/mpu401.c @@ -140,7 +140,6 @@ static struct platform_driver snd_mpu401_driver = { .remove = snd_mpu401_remove, .driver = { .name = SND_MPU401_DRIVER, - .owner = THIS_MODULE, }, }; diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c index 4b66c7f22af7..15769447688f 100644 --- a/sound/drivers/mtpav.c +++ b/sound/drivers/mtpav.c @@ -759,7 +759,6 @@ static struct platform_driver snd_mtpav_driver = { .remove = snd_mtpav_remove, .driver = { .name = SND_MTPAV_DRIVER, - .owner = THIS_MODULE, }, }; diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index 0388fbbd2c06..2a008a9ccf85 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c @@ -1030,7 +1030,6 @@ static struct platform_driver snd_mts64_driver = { .remove = snd_mts64_remove, .driver = { .name = PLATFORM_DRIVER, - .owner = THIS_MODULE, } }; diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c index 36808cdab06f..2adc7548ffca 100644 --- a/sound/drivers/pcsp/pcsp.c +++ b/sound/drivers/pcsp/pcsp.c @@ -221,7 +221,6 @@ static void pcsp_shutdown(struct platform_device *dev) static struct platform_driver pcsp_platform_driver = { .driver = { .name = "pcspkr", - .owner = THIS_MODULE, .pm = PCSP_PM_OPS, }, .probe = pcsp_probe, diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c index 78ccfa455527..464385a480e4 100644 --- a/sound/drivers/portman2x4.c +++ b/sound/drivers/portman2x4.c @@ -829,7 +829,6 @@ static struct platform_driver snd_portman_driver = { .remove = snd_portman_remove, .driver = { .name = PLATFORM_DRIVER, - .owner = THIS_MODULE, } }; diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c index 9ad4414fa25c..13a34e3c6382 100644 --- a/sound/drivers/serial-u16550.c +++ b/sound/drivers/serial-u16550.c @@ -994,7 +994,6 @@ static struct platform_driver snd_serial_driver = { .remove = snd_serial_remove, .driver = { .name = SND_SERIAL_DRIVER, - .owner = THIS_MODULE, }, }; diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c index d28d8706443c..33ef13a72e69 100644 --- a/sound/drivers/virmidi.c +++ b/sound/drivers/virmidi.c @@ -143,7 +143,6 @@ static struct platform_driver snd_virmidi_driver = { .remove = snd_virmidi_remove, .driver = { .name = SND_VIRMIDI_DRIVER, - .owner = THIS_MODULE, }, }; diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index 23441b9e6148..ede449f0b50d 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c @@ -929,7 +929,6 @@ static struct platform_driver hal2_driver = { .remove = hal2_remove, .driver = { .name = "sgihal2", - .owner = THIS_MODULE, } }; diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c index 33b08fcc27a9..f07aa3993f83 100644 --- a/sound/mips/sgio2audio.c +++ b/sound/mips/sgio2audio.c @@ -963,7 +963,6 @@ static struct platform_driver sgio2audio_driver = { .remove = snd_sgio2audio_remove, .driver = { .name = "sgio2audio", - .owner = THIS_MODULE, } }; diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c index c2d45a5848bc..3f653618614d 100644 --- a/sound/oss/dmasound/dmasound_paula.c +++ b/sound/oss/dmasound/dmasound_paula.c @@ -729,7 +729,6 @@ static struct platform_driver amiga_audio_driver = { .remove = __exit_p(amiga_audio_remove), .driver = { .name = "amiga-audio", - .owner = THIS_MODULE, }, }; diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 8337645aa7a5..8276a743e22e 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -1676,7 +1676,7 @@ irqreturn_t azx_interrupt(int irq, void *dev_id) u8 sd_status; int i; -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME) if (!pm_runtime_active(chip->card->dev)) return IRQ_NONE; diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 5ac0d39d59bc..2bf0b568e3de 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -872,7 +872,7 @@ static int azx_resume(struct device *dev) } #endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */ -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int azx_runtime_suspend(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); @@ -970,9 +970,6 @@ static int azx_runtime_idle(struct device *dev) return 0; } -#endif /* CONFIG_PM_RUNTIME */ - -#ifdef CONFIG_PM static const struct dev_pm_ops azx_pm = { SET_SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume) SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle) diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c index 350a7c8f86dd..33c6be9fb388 100644 --- a/sound/ppc/powermac.c +++ b/sound/ppc/powermac.c @@ -168,7 +168,6 @@ static struct platform_driver snd_pmac_driver = { .remove = snd_pmac_remove, .driver = { .name = SND_PMAC_DRIVER, - .owner = THIS_MODULE, .pm = SND_PMAC_PM_OPS, }, }; diff --git a/sound/sh/aica.c b/sound/sh/aica.c index 47849eaf266d..f44dda610ed2 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -652,7 +652,6 @@ static struct platform_driver snd_aica_driver = { .remove = snd_aica_remove, .driver = { .name = SND_AICA_DRIVER, - .owner = THIS_MODULE, }, }; diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c index d1fb74dabbd1..abf9c0cab1e2 100644 --- a/sound/sh/sh_dac_audio.c +++ b/sound/sh/sh_dac_audio.c @@ -436,7 +436,6 @@ static struct platform_driver sh_dac_driver = { .remove = snd_sh_dac_remove, .driver = { .name = "dac_audio", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/adi/axi-i2s.c b/sound/soc/adi/axi-i2s.c index 6058c1fd5070..7752860f7230 100644 --- a/sound/soc/adi/axi-i2s.c +++ b/sound/soc/adi/axi-i2s.c @@ -263,7 +263,6 @@ MODULE_DEVICE_TABLE(of, axi_i2s_of_match); static struct platform_driver axi_i2s_driver = { .driver = { .name = "axi-i2s", - .owner = THIS_MODULE, .of_match_table = axi_i2s_of_match, }, .probe = axi_i2s_probe, diff --git a/sound/soc/adi/axi-spdif.c b/sound/soc/adi/axi-spdif.c index 198e3a4640f6..d7259d412892 100644 --- a/sound/soc/adi/axi-spdif.c +++ b/sound/soc/adi/axi-spdif.c @@ -258,7 +258,6 @@ MODULE_DEVICE_TABLE(of, axi_spdif_of_match); static struct platform_driver axi_spdif_driver = { .driver = { .name = "axi-spdif", - .owner = THIS_MODULE, .of_match_table = axi_spdif_of_match, }, .probe = axi_spdif_probe, diff --git a/sound/soc/atmel/atmel_wm8904.c b/sound/soc/atmel/atmel_wm8904.c index 4052268ce462..aa354e1c6ff7 100644 --- a/sound/soc/atmel/atmel_wm8904.c +++ b/sound/soc/atmel/atmel_wm8904.c @@ -181,7 +181,6 @@ static const struct of_device_id atmel_asoc_wm8904_dt_ids[] = { static struct platform_driver atmel_asoc_wm8904_driver = { .driver = { .name = "atmel-wm8904-audio", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(atmel_asoc_wm8904_dt_ids), }, .probe = atmel_asoc_wm8904_probe, diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index bb1149126c54..66b66d0e7514 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -309,7 +309,6 @@ MODULE_DEVICE_TABLE(of, at91sam9g20ek_wm8731_dt_ids); static struct platform_driver at91sam9g20ek_audio_driver = { .driver = { .name = "at91sam9g20ek-audio", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(at91sam9g20ek_wm8731_dt_ids), }, .probe = at91sam9g20ek_audio_probe, diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c index 3188036a18f0..ccdf547f4d8c 100644 --- a/sound/soc/atmel/sam9x5_wm8731.c +++ b/sound/soc/atmel/sam9x5_wm8731.c @@ -192,7 +192,6 @@ MODULE_DEVICE_TABLE(of, sam9x5_wm8731_of_match); static struct platform_driver sam9x5_wm8731_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = of_match_ptr(sam9x5_wm8731_of_match), }, .probe = sam9x5_wm8731_driver_probe, diff --git a/sound/soc/au1x/ac97c.c b/sound/soc/au1x/ac97c.c index 5159a50a45a6..29a97d52e8ad 100644 --- a/sound/soc/au1x/ac97c.c +++ b/sound/soc/au1x/ac97c.c @@ -334,7 +334,6 @@ static const struct dev_pm_ops au1xpscac97_pmops = { static struct platform_driver au1xac97c_driver = { .driver = { .name = "alchemy-ac97c", - .owner = THIS_MODULE, .pm = AU1XPSCAC97_PMOPS, }, .probe = au1xac97c_drvprobe, diff --git a/sound/soc/au1x/db1000.c b/sound/soc/au1x/db1000.c index 376d976bcc2d..452f404abfd2 100644 --- a/sound/soc/au1x/db1000.c +++ b/sound/soc/au1x/db1000.c @@ -51,7 +51,6 @@ static int db1000_audio_remove(struct platform_device *pdev) static struct platform_driver db1000_audio_driver = { .driver = { .name = "db1000-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = db1000_audio_probe, diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c index decba87a074c..a747ac0b399f 100644 --- a/sound/soc/au1x/db1200.c +++ b/sound/soc/au1x/db1200.c @@ -200,7 +200,6 @@ static int db1200_audio_remove(struct platform_device *pdev) static struct platform_driver db1200_audio_driver = { .driver = { .name = "db1200-ac97", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .id_table = db1200_pids, diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c index 17a24d804734..b06b8d8128c6 100644 --- a/sound/soc/au1x/dbdma2.c +++ b/sound/soc/au1x/dbdma2.c @@ -363,7 +363,6 @@ static int au1xpsc_pcm_drvremove(struct platform_device *pdev) static struct platform_driver au1xpsc_pcm_driver = { .driver = { .name = "au1xpsc-pcm", - .owner = THIS_MODULE, }, .probe = au1xpsc_pcm_drvprobe, .remove = au1xpsc_pcm_drvremove, diff --git a/sound/soc/au1x/dma.c b/sound/soc/au1x/dma.c index e920b60bf6c2..6ffaaff469c7 100644 --- a/sound/soc/au1x/dma.c +++ b/sound/soc/au1x/dma.c @@ -331,7 +331,6 @@ static int alchemy_pcm_drvremove(struct platform_device *pdev) static struct platform_driver alchemy_pcmdma_driver = { .driver = { .name = "alchemy-pcm-dma", - .owner = THIS_MODULE, }, .probe = alchemy_pcm_drvprobe, .remove = alchemy_pcm_drvremove, diff --git a/sound/soc/au1x/i2sc.c b/sound/soc/au1x/i2sc.c index b3f37f6edbcb..450c842c776c 100644 --- a/sound/soc/au1x/i2sc.c +++ b/sound/soc/au1x/i2sc.c @@ -310,7 +310,6 @@ static const struct dev_pm_ops au1xi2sc_pmops = { static struct platform_driver au1xi2s_driver = { .driver = { .name = "alchemy-i2sc", - .owner = THIS_MODULE, .pm = AU1XI2SC_PMOPS, }, .probe = au1xi2s_drvprobe, diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index c6daec98ff89..bb53c7059005 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c @@ -490,7 +490,6 @@ static struct dev_pm_ops au1xpscac97_pmops = { static struct platform_driver au1xpsc_ac97_driver = { .driver = { .name = "au1xpsc_ac97", - .owner = THIS_MODULE, .pm = AU1XPSCAC97_PMOPS, }, .probe = au1xpsc_ac97_drvprobe, diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c index 814beffc56f2..e742ef668496 100644 --- a/sound/soc/au1x/psc-i2s.c +++ b/sound/soc/au1x/psc-i2s.c @@ -419,7 +419,6 @@ static struct dev_pm_ops au1xpsci2s_pmops = { static struct platform_driver au1xpsc_i2s_driver = { .driver = { .name = "au1xpsc_i2s", - .owner = THIS_MODULE, .pm = AU1XPSCI2S_PMOPS, }, .probe = au1xpsc_i2s_drvprobe, diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c index 2685fe4f8427..03fa1cbf8ec1 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c @@ -866,7 +866,6 @@ static struct platform_driver bcm2835_i2s_driver = { .probe = bcm2835_i2s_probe, .driver = { .name = "bcm2835-i2s", - .owner = THIS_MODULE, .of_match_table = bcm2835_i2s_of_match, }, }; diff --git a/sound/soc/blackfin/bf5xx-ac97-pcm.c b/sound/soc/blackfin/bf5xx-ac97-pcm.c index cdb8ee75ded9..238913e030e0 100644 --- a/sound/soc/blackfin/bf5xx-ac97-pcm.c +++ b/sound/soc/blackfin/bf5xx-ac97-pcm.c @@ -462,7 +462,6 @@ static int bf5xx_soc_platform_remove(struct platform_device *pdev) static struct platform_driver bf5xx_pcm_driver = { .driver = { .name = "bfin-ac97-pcm-audio", - .owner = THIS_MODULE, }, .probe = bf5xx_soc_platform_probe, diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index 6bf21a6c02e4..a040cfe29fc0 100644 --- a/sound/soc/blackfin/bf5xx-ac97.c +++ b/sound/soc/blackfin/bf5xx-ac97.c @@ -375,7 +375,6 @@ static int asoc_bfin_ac97_remove(struct platform_device *pdev) static struct platform_driver asoc_bfin_ac97_driver = { .driver = { .name = "bfin-ac97", - .owner = THIS_MODULE, }, .probe = asoc_bfin_ac97_probe, diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c index 8fcfc4ec3a51..5bf1501e5e3c 100644 --- a/sound/soc/blackfin/bf5xx-ad1836.c +++ b/sound/soc/blackfin/bf5xx-ad1836.c @@ -104,7 +104,6 @@ static int bf5xx_ad1836_driver_remove(struct platform_device *pdev) static struct platform_driver bf5xx_ad1836_driver = { .driver = { .name = "bfin-snd-ad1836", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = bf5xx_ad1836_driver_probe, diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.c b/sound/soc/blackfin/bf5xx-i2s-pcm.c index bcf591373a7a..d95477afcc67 100644 --- a/sound/soc/blackfin/bf5xx-i2s-pcm.c +++ b/sound/soc/blackfin/bf5xx-i2s-pcm.c @@ -354,7 +354,6 @@ static int bfin_i2s_soc_platform_remove(struct platform_device *pdev) static struct platform_driver bfin_i2s_pcm_driver = { .driver = { .name = "bfin-i2s-pcm-audio", - .owner = THIS_MODULE, }, .probe = bfin_i2s_soc_platform_probe, diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c index 39d774839b3e..b69aeef6418e 100644 --- a/sound/soc/blackfin/bf5xx-i2s.c +++ b/sound/soc/blackfin/bf5xx-i2s.c @@ -379,7 +379,6 @@ static struct platform_driver bfin_i2s_driver = { .remove = bf5xx_i2s_remove, .driver = { .name = "bfin-i2s", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/blackfin/bf6xx-i2s.c b/sound/soc/blackfin/bf6xx-i2s.c index 5810a0603f2f..bd3b4d464145 100644 --- a/sound/soc/blackfin/bf6xx-i2s.c +++ b/sound/soc/blackfin/bf6xx-i2s.c @@ -229,7 +229,6 @@ static struct platform_driver bfin_i2s_driver = { .remove = bfin_i2s_remove, .driver = { .name = "bfin-i2s", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/blackfin/bfin-eval-adau1373.c b/sound/soc/blackfin/bfin-eval-adau1373.c index 4ef9683bcad8..523baf5820d7 100644 --- a/sound/soc/blackfin/bfin-eval-adau1373.c +++ b/sound/soc/blackfin/bfin-eval-adau1373.c @@ -169,7 +169,6 @@ static int bfin_eval_adau1373_remove(struct platform_device *pdev) static struct platform_driver bfin_eval_adau1373_driver = { .driver = { .name = "bfin-eval-adau1373", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = bfin_eval_adau1373_probe, diff --git a/sound/soc/blackfin/bfin-eval-adau1701.c b/sound/soc/blackfin/bfin-eval-adau1701.c index 3b55081a96c0..f9e926dfd4ef 100644 --- a/sound/soc/blackfin/bfin-eval-adau1701.c +++ b/sound/soc/blackfin/bfin-eval-adau1701.c @@ -109,7 +109,6 @@ static int bfin_eval_adau1701_remove(struct platform_device *pdev) static struct platform_driver bfin_eval_adau1701_driver = { .driver = { .name = "bfin-eval-adau1701", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = bfin_eval_adau1701_probe, diff --git a/sound/soc/blackfin/bfin-eval-adau1x61.c b/sound/soc/blackfin/bfin-eval-adau1x61.c index 3011906f9d3b..4229f76daec9 100644 --- a/sound/soc/blackfin/bfin-eval-adau1x61.c +++ b/sound/soc/blackfin/bfin-eval-adau1x61.c @@ -129,7 +129,6 @@ static int bfin_eval_adau1x61_probe(struct platform_device *pdev) static struct platform_driver bfin_eval_adau1x61_driver = { .driver = { .name = "bfin-eval-adau1x61", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = bfin_eval_adau1x61_probe, diff --git a/sound/soc/blackfin/bfin-eval-adau1x81.c b/sound/soc/blackfin/bfin-eval-adau1x81.c index 5c380f6aed1a..3e01cbe53fc7 100644 --- a/sound/soc/blackfin/bfin-eval-adau1x81.c +++ b/sound/soc/blackfin/bfin-eval-adau1x81.c @@ -117,7 +117,6 @@ static int bfin_eval_adau1x81_probe(struct platform_device *pdev) static struct platform_driver bfin_eval_adau1x81_driver = { .driver = { .name = "bfin-eval-adau1x81", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = bfin_eval_adau1x81_probe, diff --git a/sound/soc/blackfin/bfin-eval-adav80x.c b/sound/soc/blackfin/bfin-eval-adav80x.c index 3b1b61a44815..27eee66afdb2 100644 --- a/sound/soc/blackfin/bfin-eval-adav80x.c +++ b/sound/soc/blackfin/bfin-eval-adav80x.c @@ -141,7 +141,6 @@ MODULE_DEVICE_TABLE(platform, bfin_eval_adav80x_ids); static struct platform_driver bfin_eval_adav80x_driver = { .driver = { .name = "bfin-eval-adav80x", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = bfin_eval_adav80x_probe, diff --git a/sound/soc/cirrus/edb93xx.c b/sound/soc/cirrus/edb93xx.c index 4f900efc437c..85962657aabe 100644 --- a/sound/soc/cirrus/edb93xx.c +++ b/sound/soc/cirrus/edb93xx.c @@ -113,7 +113,6 @@ static int edb93xx_remove(struct platform_device *pdev) static struct platform_driver edb93xx_driver = { .driver = { .name = "edb93xx-audio", - .owner = THIS_MODULE, }, .probe = edb93xx_probe, .remove = edb93xx_remove, diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index 6b8a366b0211..bbf7a9266a99 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -439,7 +439,6 @@ static struct platform_driver ep93xx_ac97_driver = { .remove = ep93xx_ac97_remove, .driver = { .name = "ep93xx-ac97", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 943145f9d1b6..934f8aefdd90 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -451,7 +451,6 @@ static struct platform_driver ep93xx_i2s_driver = { .remove = ep93xx_i2s_remove, .driver = { .name = "ep93xx-i2s", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/cirrus/simone.c b/sound/soc/cirrus/simone.c index 822a19a89e74..1ec661834e5a 100644 --- a/sound/soc/cirrus/simone.c +++ b/sound/soc/cirrus/simone.c @@ -74,7 +74,6 @@ static int simone_remove(struct platform_device *pdev) static struct platform_driver simone_driver = { .driver = { .name = "simone-audio", - .owner = THIS_MODULE, }, .probe = simone_probe, .remove = simone_remove, diff --git a/sound/soc/cirrus/snappercl15.c b/sound/soc/cirrus/snappercl15.c index 5b68b106cfc2..98089df08df6 100644 --- a/sound/soc/cirrus/snappercl15.c +++ b/sound/soc/cirrus/snappercl15.c @@ -123,7 +123,6 @@ static int snappercl15_remove(struct platform_device *pdev) static struct platform_driver snappercl15_driver = { .driver = { .name = "snappercl15-audio", - .owner = THIS_MODULE, }, .probe = snappercl15_probe, .remove = snappercl15_remove, diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index e88a6b67f781..a2bf27f4baab 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c @@ -1423,7 +1423,6 @@ static int pm860x_codec_remove(struct platform_device *pdev) static struct platform_driver pm860x_codec_driver = { .driver = { .name = "88pm860x-codec", - .owner = THIS_MODULE, }, .probe = pm860x_codec_probe, .remove = pm860x_codec_remove, diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 7dfbc9921e91..7895689588da 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -2609,7 +2609,6 @@ static int ab8500_codec_driver_remove(struct platform_device *pdev) static struct platform_driver ab8500_codec_platform_driver = { .driver = { .name = "ab8500-codec", - .owner = THIS_MODULE, }, .probe = ab8500_codec_driver_probe, .remove = ab8500_codec_driver_remove, diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index c6e5a313ebf4..d0ac723eee32 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c @@ -142,7 +142,6 @@ static int ac97_remove(struct platform_device *pdev) static struct platform_driver ac97_codec_driver = { .driver = { .name = "ac97-codec", - .owner = THIS_MODULE, }, .probe = ac97_probe, diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index 2860eef8610c..3cc69a626454 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c @@ -334,7 +334,6 @@ static int ad1980_remove(struct platform_device *pdev) static struct platform_driver ad1980_codec_driver = { .driver = { .name = "ad1980", - .owner = THIS_MODULE, }, .probe = ad1980_probe, diff --git a/sound/soc/codecs/ad73311.c b/sound/soc/codecs/ad73311.c index 5fac8adbc136..a9400aef60b5 100644 --- a/sound/soc/codecs/ad73311.c +++ b/sound/soc/codecs/ad73311.c @@ -76,7 +76,6 @@ static int ad73311_remove(struct platform_device *pdev) static struct platform_driver ad73311_codec_driver = { .driver = { .name = "ad73311", - .owner = THIS_MODULE, }, .probe = ad73311_probe, diff --git a/sound/soc/codecs/ads117x.c b/sound/soc/codecs/ads117x.c index 8f388edff586..1222282e93c3 100644 --- a/sound/soc/codecs/ads117x.c +++ b/sound/soc/codecs/ads117x.c @@ -78,7 +78,6 @@ static int ads117x_remove(struct platform_device *pdev) static struct platform_driver ads117x_codec_driver = { .driver = { .name = "ads117x-codec", - .owner = THIS_MODULE, }, .probe = ads117x_probe, diff --git a/sound/soc/codecs/ak4554.c b/sound/soc/codecs/ak4554.c index 79e9555766c0..16ce9f9fefa1 100644 --- a/sound/soc/codecs/ak4554.c +++ b/sound/soc/codecs/ak4554.c @@ -93,7 +93,6 @@ MODULE_DEVICE_TABLE(of, ak4554_of_match); static struct platform_driver ak4554_driver = { .driver = { .name = "ak4554-adc-dac", - .owner = THIS_MODULE, .of_match_table = ak4554_of_match, }, .probe = ak4554_soc_probe, diff --git a/sound/soc/codecs/ak5386.c b/sound/soc/codecs/ak5386.c index 8107a1cac876..afa95360826d 100644 --- a/sound/soc/codecs/ak5386.c +++ b/sound/soc/codecs/ak5386.c @@ -205,7 +205,6 @@ static struct platform_driver ak5386_driver = { .remove = ak5386_remove, .driver = { .name = "ak5386", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(ak5386_dt_ids), }, }; diff --git a/sound/soc/codecs/bt-sco.c b/sound/soc/codecs/bt-sco.c index c4cf0699e77f..5075bf0a7276 100644 --- a/sound/soc/codecs/bt-sco.c +++ b/sound/soc/codecs/bt-sco.c @@ -77,7 +77,6 @@ MODULE_DEVICE_TABLE(platform, bt_sco_driver_ids); static struct platform_driver bt_sco_driver = { .driver = { .name = "bt-sco", - .owner = THIS_MODULE, }, .probe = bt_sco_probe, .remove = bt_sco_remove, diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 8d638e8aa8eb..d6dedd4eab29 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -151,7 +151,6 @@ static int cq93vc_platform_remove(struct platform_device *pdev) static struct platform_driver cq93vc_codec_driver = { .driver = { .name = "cq93vc-codec", - .owner = THIS_MODULE, }, .probe = cq93vc_platform_probe, diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c index c125925da92e..ec55c590afd0 100644 --- a/sound/soc/codecs/cs35l32.c +++ b/sound/soc/codecs/cs35l32.c @@ -550,7 +550,7 @@ static int cs35l32_i2c_remove(struct i2c_client *i2c_client) return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int cs35l32_runtime_suspend(struct device *dev) { struct cs35l32_private *cs35l32 = dev_get_drvdata(dev); diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c index 02b1520ae0bc..670ebfe12903 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -537,7 +537,7 @@ err_enable: } EXPORT_SYMBOL_GPL(cs42xx8_probe); -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int cs42xx8_runtime_resume(struct device *dev) { struct cs42xx8_priv *cs42xx8 = dev_get_drvdata(dev); diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c index 8f95b0300f1a..0b10979513c4 100644 --- a/sound/soc/codecs/cx20442.c +++ b/sound/soc/codecs/cx20442.c @@ -429,7 +429,6 @@ static int __exit cx20442_platform_remove(struct platform_device *pdev) static struct platform_driver cx20442_platform_driver = { .driver = { .name = "cx20442-codec", - .owner = THIS_MODULE, }, .probe = cx20442_platform_probe, .remove = __exit_p(cx20442_platform_remove), diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c index b2090b2a5e2d..fde53251c047 100644 --- a/sound/soc/codecs/dmic.c +++ b/sound/soc/codecs/dmic.c @@ -74,7 +74,6 @@ MODULE_ALIAS("platform:dmic-codec"); static struct platform_driver dmic_driver = { .driver = { .name = "dmic-codec", - .owner = THIS_MODULE, }, .probe = dmic_dev_probe, .remove = dmic_dev_remove, diff --git a/sound/soc/codecs/hdmi.c b/sound/soc/codecs/hdmi.c index 1391ad50f95d..bd42ad34e004 100644 --- a/sound/soc/codecs/hdmi.c +++ b/sound/soc/codecs/hdmi.c @@ -94,7 +94,6 @@ static int hdmi_codec_remove(struct platform_device *pdev) static struct platform_driver hdmi_codec_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = of_match_ptr(hdmi_audio_codec_ids), }, diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index df7c01cf7072..933f4476d76c 100644 --- a/sound/soc/codecs/jz4740.c +++ b/sound/soc/codecs/jz4740.c @@ -364,7 +364,6 @@ static struct platform_driver jz4740_codec_driver = { .remove = jz4740_codec_remove, .driver = { .name = "jz4740-codec", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 151f718241ea..b112b1c2c394 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -2611,7 +2611,7 @@ static int max98090_i2c_remove(struct i2c_client *client) return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int max98090_runtime_resume(struct device *dev) { struct max98090_priv *max98090 = dev_get_drvdata(dev); diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index 71f775aad7c7..c1e441c2c8af 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c @@ -802,7 +802,6 @@ static int mc13783_codec_remove(struct platform_device *pdev) static struct platform_driver mc13783_codec_driver = { .driver = { .name = "mc13783-codec", - .owner = THIS_MODULE, }, .remove = mc13783_codec_remove, }; diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c index b6618c4a7597..7e73fa4b3183 100644 --- a/sound/soc/codecs/pcm3008.c +++ b/sound/soc/codecs/pcm3008.c @@ -162,7 +162,6 @@ static struct platform_driver pcm3008_codec_driver = { .remove = pcm3008_codec_remove, .driver = { .name = "pcm3008-codec", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 0c8aefab404c..e5f2fb884bf3 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -517,7 +517,7 @@ void pcm512x_remove(struct device *dev) } EXPORT_SYMBOL_GPL(pcm512x_remove); -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int pcm512x_suspend(struct device *dev) { struct pcm512x_priv *pcm512x = dev_get_drvdata(dev); diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c index cdf882fa7716..3e72964280c6 100644 --- a/sound/soc/codecs/si476x.c +++ b/sound/soc/codecs/si476x.c @@ -261,7 +261,6 @@ MODULE_ALIAS("platform:si476x-codec"); static struct platform_driver si476x_platform_driver = { .driver = { .name = "si476x-codec", - .owner = THIS_MODULE, }, .probe = si476x_platform_probe, .remove = si476x_platform_remove, diff --git a/sound/soc/codecs/sirf-audio-codec.c b/sound/soc/codecs/sirf-audio-codec.c index 07eea20e6645..0a8e43c98a07 100644 --- a/sound/soc/codecs/sirf-audio-codec.c +++ b/sound/soc/codecs/sirf-audio-codec.c @@ -567,7 +567,6 @@ static const struct dev_pm_ops sirf_audio_codec_pm_ops = { static struct platform_driver sirf_audio_codec_driver = { .driver = { .name = "sirf-audio-codec", - .owner = THIS_MODULE, .of_match_table = sirf_audio_codec_of_match, .pm = &sirf_audio_codec_pm_ops, }, diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c index 31d97cd5e59b..1f451a1946eb 100644 --- a/sound/soc/codecs/sn95031.c +++ b/sound/soc/codecs/sn95031.c @@ -907,7 +907,6 @@ static int sn95031_device_remove(struct platform_device *pdev) static struct platform_driver sn95031_codec_driver = { .driver = { .name = "sn95031", - .owner = THIS_MODULE, }, .probe = sn95031_device_probe, .remove = sn95031_device_remove, diff --git a/sound/soc/codecs/spdif_receiver.c b/sound/soc/codecs/spdif_receiver.c index e3501f40c7b3..3ec41ccbf4e2 100644 --- a/sound/soc/codecs/spdif_receiver.c +++ b/sound/soc/codecs/spdif_receiver.c @@ -80,7 +80,6 @@ static struct platform_driver spdif_dir_driver = { .remove = spdif_dir_remove, .driver = { .name = "spdif-dir", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(spdif_dir_dt_ids), }, }; diff --git a/sound/soc/codecs/spdif_transmitter.c b/sound/soc/codecs/spdif_transmitter.c index e0df537dd4b7..ef634a9ad673 100644 --- a/sound/soc/codecs/spdif_transmitter.c +++ b/sound/soc/codecs/spdif_transmitter.c @@ -80,7 +80,6 @@ static struct platform_driver spdif_dit_driver = { .remove = spdif_dit_remove, .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = of_match_ptr(spdif_dit_dt_ids), }, }; diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c index dbff0c89be48..6464caf72b21 100644 --- a/sound/soc/codecs/stac9766.c +++ b/sound/soc/codecs/stac9766.c @@ -394,7 +394,6 @@ static int stac9766_remove(struct platform_device *pdev) static struct platform_driver stac9766_codec_driver = { .driver = { .name = "stac9766-codec", - .owner = THIS_MODULE, }, .probe = stac9766_probe, diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c index b505212019e2..ae23acdd2708 100644 --- a/sound/soc/codecs/tas2552.c +++ b/sound/soc/codecs/tas2552.c @@ -115,7 +115,7 @@ static const struct snd_soc_dapm_route tas2552_audio_map[] = { {"ClassD", NULL, "PLL"}, }; -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static void tas2552_sw_shutdown(struct tas2552_data *tas_data, int sw_shutdown) { u8 cfg1_reg; @@ -264,7 +264,7 @@ static int tas2552_mute(struct snd_soc_dai *dai, int mute) return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int tas2552_runtime_suspend(struct device *dev) { struct tas2552_data *tas2552 = dev_get_drvdata(dev); diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 27f3b21effb2..44af3188afb9 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -2218,7 +2218,6 @@ static struct platform_driver twl4030_codec_driver = { .remove = twl4030_codec_remove, .driver = { .name = "twl4030-codec", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 5ff2b1e4638e..90f47f988b3f 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -1177,7 +1177,6 @@ static int twl6040_codec_remove(struct platform_device *pdev) static struct platform_driver twl6040_codec_driver = { .driver = { .name = "twl6040-codec", - .owner = THIS_MODULE, }, .probe = twl6040_codec_probe, .remove = twl6040_codec_remove, diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index 4056260a502e..f883308c00de 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c @@ -605,7 +605,6 @@ static int uda134x_codec_remove(struct platform_device *pdev) static struct platform_driver uda134x_codec_driver = { .driver = { .name = "uda134x-codec", - .owner = THIS_MODULE, }, .probe = uda134x_codec_probe, .remove = uda134x_codec_remove, diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c index 00aea4100bb3..80fb1dc81f6c 100644 --- a/sound/soc/codecs/wl1273.c +++ b/sound/soc/codecs/wl1273.c @@ -511,7 +511,6 @@ MODULE_ALIAS("platform:wl1273-codec"); static struct platform_driver wl1273_platform_driver = { .driver = { .name = "wl1273-codec", - .owner = THIS_MODULE, }, .probe = wl1273_platform_probe, .remove = wl1273_platform_remove, diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index cdea9d9c1631..15599845a660 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -2440,7 +2440,7 @@ static int wm2200_i2c_remove(struct i2c_client *i2c) return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int wm2200_runtime_suspend(struct device *dev) { struct wm2200_priv *wm2200 = dev_get_drvdata(dev); diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index a01ad629ed61..b80970dc2d2f 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2664,7 +2664,7 @@ static int wm5100_i2c_remove(struct i2c_client *i2c) return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int wm5100_runtime_suspend(struct device *dev) { struct wm5100_priv *wm5100 = dev_get_drvdata(dev); diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index d78fb8dffc8c..f439ae052128 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1960,7 +1960,6 @@ static int wm5102_remove(struct platform_device *pdev) static struct platform_driver wm5102_codec_driver = { .driver = { .name = "wm5102-codec", - .owner = THIS_MODULE, }, .probe = wm5102_probe, .remove = wm5102_remove, diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 2f2ec26d831c..4456b38a3ef5 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -1738,7 +1738,6 @@ static int wm5110_remove(struct platform_device *pdev) static struct platform_driver wm5110_codec_driver = { .driver = { .name = "wm5110-codec", - .owner = THIS_MODULE, }, .probe = wm5110_probe, .remove = wm5110_remove, diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 87f664b9cc7d..574579b98872 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -1622,7 +1622,6 @@ static int wm8350_remove(struct platform_device *pdev) static struct platform_driver wm8350_codec_driver = { .driver = { .name = "wm8350-codec", - .owner = THIS_MODULE, }, .probe = wm8350_probe, .remove = wm8350_remove, diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 385894f6e264..8ee446987aa9 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c @@ -1365,7 +1365,6 @@ static int wm8400_remove(struct platform_device *pdev) static struct platform_driver wm8400_codec_driver = { .driver = { .name = "wm8400-codec", - .owner = THIS_MODULE, }, .probe = wm8400_probe, .remove = wm8400_remove, diff --git a/sound/soc/codecs/wm8727.c b/sound/soc/codecs/wm8727.c index 7b1a6d5c11c6..bb25a75f92a2 100644 --- a/sound/soc/codecs/wm8727.c +++ b/sound/soc/codecs/wm8727.c @@ -75,7 +75,6 @@ static int wm8727_remove(struct platform_device *pdev) static struct platform_driver wm8727_codec_driver = { .driver = { .name = "wm8727", - .owner = THIS_MODULE, }, .probe = wm8727_probe, diff --git a/sound/soc/codecs/wm8782.c b/sound/soc/codecs/wm8782.c index 8092495605ce..fb55fd845d27 100644 --- a/sound/soc/codecs/wm8782.c +++ b/sound/soc/codecs/wm8782.c @@ -72,7 +72,6 @@ static int wm8782_remove(struct platform_device *pdev) static struct platform_driver wm8782_codec_driver = { .driver = { .name = "wm8782", - .owner = THIS_MODULE, }, .probe = wm8782_probe, .remove = wm8782_remove, diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 1534d88a66e9..d32d554f5b34 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3785,7 +3785,7 @@ static int wm8962_i2c_remove(struct i2c_client *client) return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int wm8962_runtime_resume(struct device *dev) { struct wm8962_priv *wm8962 = dev_get_drvdata(dev); diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 36b767fa37a6..1b97de2e4e67 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -4508,7 +4508,6 @@ static const struct dev_pm_ops wm8994_pm_ops = { static struct platform_driver wm8994_codec_driver = { .driver = { .name = "wm8994-codec", - .owner = THIS_MODULE, .pm = &wm8994_pm_ops, }, .probe = wm8994_probe, diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c index ab33fe596519..7e8bfe27566b 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -1165,7 +1165,6 @@ static int wm8997_remove(struct platform_device *pdev) static struct platform_driver wm8997_codec_driver = { .driver = { .name = "wm8997-codec", - .owner = THIS_MODULE, }, .probe = wm8997_probe, .remove = wm8997_remove, diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index d3a800fa6f06..3eddb18fefd1 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -407,7 +407,6 @@ static int wm9705_remove(struct platform_device *pdev) static struct platform_driver wm9705_codec_driver = { .driver = { .name = "wm9705-codec", - .owner = THIS_MODULE, }, .probe = wm9705_probe, diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 7c45971bb4ec..e04643d2bb24 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -741,7 +741,6 @@ static int wm9712_remove(struct platform_device *pdev) static struct platform_driver wm9712_codec_driver = { .driver = { .name = "wm9712-codec", - .owner = THIS_MODULE, }, .probe = wm9712_probe, diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 5df7f6d12bef..71b9d5b0734d 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1301,7 +1301,6 @@ static int wm9713_remove(struct platform_device *pdev) static struct platform_driver wm9713_codec_driver = { .driver = { .name = "wm9713-codec", - .owner = THIS_MODULE, }, .probe = wm9713_probe, diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index a50010e2891f..158cb3d1db70 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -445,7 +445,6 @@ static struct platform_driver davinci_evm_driver = { .remove = davinci_evm_remove, .driver = { .name = "davinci_evm", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = of_match_ptr(davinci_evm_dt_ids), }, diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index 7682af31d6e6..15fb28fc8e1b 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c @@ -770,7 +770,6 @@ static struct platform_driver davinci_mcbsp_driver = { .remove = davinci_i2s_remove, .driver = { .name = "davinci-mcbsp", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 0dab382ba147..30b94d4f9c5d 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -1602,7 +1602,6 @@ static struct platform_driver davinci_mcasp_driver = { .remove = davinci_mcasp_remove, .driver = { .name = "davinci-mcasp", - .owner = THIS_MODULE, .of_match_table = mcasp_dt_ids, }, }; diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c index 77aef05588c3..5bee04279ebe 100644 --- a/sound/soc/davinci/davinci-vcif.c +++ b/sound/soc/davinci/davinci-vcif.c @@ -267,7 +267,6 @@ static struct platform_driver davinci_vcif_driver = { .remove = davinci_vcif_remove, .driver = { .name = "davinci-vcif", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index 08f0229f8d68..b93168d4f648 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c @@ -441,7 +441,6 @@ static struct platform_driver dw_i2s_driver = { .remove = dw_i2s_remove, .driver = { .name = "designware-i2s", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c index b175b0145a42..9ce70fc67b09 100644 --- a/sound/soc/fsl/eukrea-tlv320.c +++ b/sound/soc/fsl/eukrea-tlv320.c @@ -238,7 +238,6 @@ MODULE_DEVICE_TABLE(of, imx_tlv320_dt_ids); static struct platform_driver eukrea_tlv320_driver = { .driver = { .name = "eukrea_tlv320", - .owner = THIS_MODULE, .of_match_table = imx_tlv320_dt_ids, }, .probe = eukrea_tlv320_probe, diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index 9deabdd2b1a2..026a80117540 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -928,7 +928,7 @@ static int fsl_asrc_probe(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int fsl_asrc_runtime_resume(struct device *dev) { struct fsl_asrc *asrc_priv = dev_get_drvdata(dev); @@ -954,7 +954,7 @@ static int fsl_asrc_runtime_suspend(struct device *dev) return 0; } -#endif /* CONFIG_PM_RUNTIME */ +#endif /* CONFIG_PM */ #ifdef CONFIG_PM_SLEEP static int fsl_asrc_suspend(struct device *dev) diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c index b2b108805b24..93d7e56c6066 100644 --- a/sound/soc/fsl/fsl_dma.c +++ b/sound/soc/fsl/fsl_dma.c @@ -964,7 +964,6 @@ MODULE_DEVICE_TABLE(of, fsl_soc_dma_ids); static struct platform_driver fsl_soc_dma_driver = { .driver = { .name = "fsl-pcm-audio", - .owner = THIS_MODULE, .of_match_table = fsl_soc_dma_ids, }, .probe = fsl_soc_dma_probe, diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index ca319d59f843..1c08ab13637c 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -857,7 +857,6 @@ static struct platform_driver fsl_esai_driver = { .probe = fsl_esai_probe, .driver = { .name = "fsl-esai-dai", - .owner = THIS_MODULE, .of_match_table = fsl_esai_dt_ids, }, }; diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 7eeb1dd8ce27..032d2d33619c 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -678,7 +678,6 @@ static struct platform_driver fsl_sai_driver = { .probe = fsl_sai_probe, .driver = { .name = "fsl-sai", - .owner = THIS_MODULE, .of_match_table = fsl_sai_ids, }, }; diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 9b791621294c..af0429421fc8 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -1283,7 +1283,6 @@ MODULE_DEVICE_TABLE(of, fsl_spdif_dt_ids); static struct platform_driver fsl_spdif_driver = { .driver = { .name = "fsl-spdif-dai", - .owner = THIS_MODULE, .of_match_table = fsl_spdif_dt_ids, }, .probe = fsl_spdif_probe, diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index b6b0d25f6ace..a65f17d57ffb 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1480,7 +1480,6 @@ static int fsl_ssi_remove(struct platform_device *pdev) static struct platform_driver fsl_ssi_driver = { .driver = { .name = "fsl-ssi-dai", - .owner = THIS_MODULE, .of_match_table = fsl_ssi_ids, }, .probe = fsl_ssi_probe, diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index 46f9beb6b273..d9050d946ae7 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c @@ -356,7 +356,6 @@ static struct platform_driver imx_audmux_driver = { .id_table = imx_audmux_ids, .driver = { .name = DRIVER_NAME, - .owner = THIS_MODULE, .of_match_table = imx_audmux_dt_ids, } }; diff --git a/sound/soc/fsl/imx-mc13783.c b/sound/soc/fsl/imx-mc13783.c index a2fd7321b5a9..6bf5bce01a92 100644 --- a/sound/soc/fsl/imx-mc13783.c +++ b/sound/soc/fsl/imx-mc13783.c @@ -159,7 +159,6 @@ static int imx_mc13783_remove(struct platform_device *pdev) static struct platform_driver imx_mc13783_audio_driver = { .driver = { .name = "imx_mc13783", - .owner = THIS_MODULE, }, .probe = imx_mc13783_probe, .remove = imx_mc13783_remove diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index 1dab963a59f7..b99e0b5e00e9 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -200,7 +200,6 @@ MODULE_DEVICE_TABLE(of, imx_sgtl5000_dt_ids); static struct platform_driver imx_sgtl5000_driver = { .driver = { .name = "imx-sgtl5000", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = imx_sgtl5000_dt_ids, }, diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c index 0c9068ebe1e7..e94704f1b9ee 100644 --- a/sound/soc/fsl/imx-spdif.c +++ b/sound/soc/fsl/imx-spdif.c @@ -88,7 +88,6 @@ MODULE_DEVICE_TABLE(of, imx_spdif_dt_ids); static struct platform_driver imx_spdif_driver = { .driver = { .name = "imx-spdif", - .owner = THIS_MODULE, .of_match_table = imx_spdif_dt_ids, }, .probe = imx_spdif_audio_probe, diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 60b0a5b1f1f1..fa801e17c51e 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -647,7 +647,6 @@ static struct platform_driver imx_ssi_driver = { .driver = { .name = "imx-ssi", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c index 48179ffe1543..4caacb05a623 100644 --- a/sound/soc/fsl/imx-wm8962.c +++ b/sound/soc/fsl/imx-wm8962.c @@ -307,7 +307,6 @@ MODULE_DEVICE_TABLE(of, imx_wm8962_dt_ids); static struct platform_driver imx_wm8962_driver = { .driver = { .name = "imx-wm8962", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = imx_wm8962_dt_ids, }, diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c index c6ed6ba965a9..08d2a8069b0a 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/sound/soc/fsl/mpc5200_psc_ac97.c @@ -338,7 +338,6 @@ static struct platform_driver psc_ac97_driver = { .remove = psc_ac97_of_remove, .driver = { .name = "mpc5200-psc-ac97", - .owner = THIS_MODULE, .of_match_table = psc_ac97_match, }, }; diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index 5d07e8a74a21..51fb0c00fe73 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c @@ -229,7 +229,6 @@ static struct platform_driver psc_i2s_driver = { .remove = psc_i2s_of_remove, .driver = { .name = "mpc5200-psc-i2s", - .owner = THIS_MODULE, .of_match_table = psc_i2s_match, }, }; diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index fa756d05b2f7..9621b9140df6 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c @@ -389,7 +389,6 @@ static struct platform_driver mpc8610_hpcd_driver = { * in lowercase letters. */ .name = "snd-soc-mpc8610hpcd", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/fsl/mx27vis-aic32x4.c b/sound/soc/fsl/mx27vis-aic32x4.c index f4c3bda5e69e..b1ced7b8d80c 100644 --- a/sound/soc/fsl/mx27vis-aic32x4.c +++ b/sound/soc/fsl/mx27vis-aic32x4.c @@ -229,7 +229,6 @@ static int mx27vis_aic32x4_remove(struct platform_device *pdev) static struct platform_driver mx27vis_aic32x4_audio_driver = { .driver = { .name = "mx27vis", - .owner = THIS_MODULE, }, .probe = mx27vis_aic32x4_probe, .remove = mx27vis_aic32x4_remove, diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c index f75c3cf0e6de..71c1a7dc3aeb 100644 --- a/sound/soc/fsl/p1022_ds.c +++ b/sound/soc/fsl/p1022_ds.c @@ -398,7 +398,6 @@ static struct platform_driver p1022_ds_driver = { * in lowercase letters. */ .name = "snd-soc-p1022ds", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/fsl/p1022_rdk.c b/sound/soc/fsl/p1022_rdk.c index 9d89bb028621..ee29048424be 100644 --- a/sound/soc/fsl/p1022_rdk.c +++ b/sound/soc/fsl/p1022_rdk.c @@ -348,7 +348,6 @@ static struct platform_driver p1022_rdk_driver = { * in lowercase letters. */ .name = "snd-soc-p1022rdk", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c index 3665f612819d..c44459d24c50 100644 --- a/sound/soc/fsl/pcm030-audio-fabric.c +++ b/sound/soc/fsl/pcm030-audio-fabric.c @@ -124,7 +124,6 @@ static struct platform_driver pcm030_fabric_driver = { .remove = pcm030_fabric_remove, .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = pcm030_audio_match, }, }; diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index ece22d55ba82..fb9240fdc9b7 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -584,7 +584,6 @@ MODULE_DEVICE_TABLE(of, asoc_simple_of_match); static struct platform_driver asoc_simple_card = { .driver = { .name = "asoc-simple-card", - .owner = THIS_MODULE, .of_match_table = asoc_simple_of_match, }, .probe = asoc_simple_card_probe, diff --git a/sound/soc/intel/broadwell.c b/sound/soc/intel/broadwell.c index c256764e3c4b..7cf95d5d5d80 100644 --- a/sound/soc/intel/broadwell.c +++ b/sound/soc/intel/broadwell.c @@ -270,7 +270,6 @@ static struct platform_driver broadwell_audio = { .remove = broadwell_audio_remove, .driver = { .name = "broadwell-audio", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/byt-max98090.c index d52681e7225e..9832afe7d22c 100644 --- a/sound/soc/intel/byt-max98090.c +++ b/sound/soc/intel/byt-max98090.c @@ -181,7 +181,6 @@ static struct platform_driver byt_max98090_driver = { .remove = byt_max98090_remove, .driver = { .name = "byt-max98090", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, }; diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c index e03abdf21c1b..0cba7830c5e9 100644 --- a/sound/soc/intel/byt-rt5640.c +++ b/sound/soc/intel/byt-rt5640.c @@ -224,7 +224,6 @@ static struct platform_driver byt_rt5640_audio = { .probe = byt_rt5640_probe, .driver = { .name = "byt-rt5640", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, }; diff --git a/sound/soc/intel/haswell.c b/sound/soc/intel/haswell.c index cb8a482b5f30..35edf51a52aa 100644 --- a/sound/soc/intel/haswell.c +++ b/sound/soc/intel/haswell.c @@ -199,7 +199,6 @@ static struct platform_driver haswell_audio = { .probe = haswell_audio_probe, .driver = { .name = "haswell-audio", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/intel/mfld_machine.c b/sound/soc/intel/mfld_machine.c index 031d78783fc8..90b7a57713a0 100644 --- a/sound/soc/intel/mfld_machine.c +++ b/sound/soc/intel/mfld_machine.c @@ -420,7 +420,6 @@ static int snd_mfld_mc_probe(struct platform_device *pdev) static struct platform_driver snd_mfld_mc_driver = { .driver = { - .owner = THIS_MODULE, .name = "msic_audio", }, .probe = snd_mfld_mc_probe, diff --git a/sound/soc/intel/sst-acpi.c b/sound/soc/intel/sst-acpi.c index 03d0a166b635..b3d84560fbb5 100644 --- a/sound/soc/intel/sst-acpi.c +++ b/sound/soc/intel/sst-acpi.c @@ -275,7 +275,6 @@ static struct platform_driver sst_acpi_driver = { .remove = sst_acpi_remove, .driver = { .name = "sst-acpi", - .owner = THIS_MODULE, .acpi_match_table = ACPI_PTR(sst_acpi_match), }, }; diff --git a/sound/soc/intel/sst-baytrail-pcm.c b/sound/soc/intel/sst-baytrail-pcm.c index eab1c7d85187..3bb6288d8b4d 100644 --- a/sound/soc/intel/sst-baytrail-pcm.c +++ b/sound/soc/intel/sst-baytrail-pcm.c @@ -497,7 +497,6 @@ static int sst_byt_pcm_dev_remove(struct platform_device *pdev) static struct platform_driver sst_byt_pcm_driver = { .driver = { .name = "baytrail-pcm-audio", - .owner = THIS_MODULE, .pm = SST_BYT_PM_OPS, }, diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c index 0180b386c421..b8a782c0d4cd 100644 --- a/sound/soc/intel/sst-haswell-pcm.c +++ b/sound/soc/intel/sst-haswell-pcm.c @@ -1170,9 +1170,7 @@ static const struct dev_pm_ops hsw_pcm_pm = { static struct platform_driver hsw_pcm_driver = { .driver = { .name = "haswell-pcm-audio", - .owner = THIS_MODULE, .pm = &hsw_pcm_pm, - }, .probe = hsw_pcm_dev_probe, diff --git a/sound/soc/intel/sst-mfld-platform-pcm.c b/sound/soc/intel/sst-mfld-platform-pcm.c index 6032f18693be..a1a8d9d91539 100644 --- a/sound/soc/intel/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/sst-mfld-platform-pcm.c @@ -737,7 +737,6 @@ static int sst_platform_remove(struct platform_device *pdev) static struct platform_driver sst_platform_driver = { .driver = { .name = "sst-mfld-platform", - .owner = THIS_MODULE, }, .probe = sst_platform_probe, .remove = sst_platform_remove, diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index 3f9c3a9ae36f..d3d45c6f064f 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -455,7 +455,6 @@ static struct platform_driver jz4740_i2s_driver = { .probe = jz4740_i2s_dev_probe, .driver = { .name = "jz4740-i2s", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c index 0fb7d2a91c3a..53586999fcaa 100644 --- a/sound/soc/jz4740/qi_lb60.c +++ b/sound/soc/jz4740/qi_lb60.c @@ -100,7 +100,6 @@ static int qi_lb60_probe(struct platform_device *pdev) static struct platform_driver qi_lb60_driver = { .driver = { .name = "qi-lb60-audio", - .owner = THIS_MODULE, }, .probe = qi_lb60_probe, }; diff --git a/sound/soc/kirkwood/armada-370-db.c b/sound/soc/kirkwood/armada-370-db.c index c44333849259..de7563bdc5c2 100644 --- a/sound/soc/kirkwood/armada-370-db.c +++ b/sound/soc/kirkwood/armada-370-db.c @@ -134,7 +134,6 @@ static const struct of_device_id a370db_dt_ids[] = { static struct platform_driver a370db_driver = { .driver = { .name = "a370db-audio", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(a370db_dt_ids), }, .probe = a370db_probe, diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 0704cd6d2314..def7d8260c4e 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -657,7 +657,6 @@ static struct platform_driver kirkwood_i2s_driver = { .remove = kirkwood_i2s_dev_remove, .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = of_match_ptr(mvebu_audio_of_match), }, }; diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 83b2fea09219..d9865082160c 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -815,7 +815,6 @@ static struct platform_driver mxs_saif_driver = { .driver = { .name = "mxs-saif", - .owner = THIS_MODULE, .of_match_table = mxs_saif_dt_ids, }, }; diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index 3bba6cfe4f29..6f1916b71815 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c @@ -187,7 +187,6 @@ MODULE_DEVICE_TABLE(of, mxs_sgtl5000_dt_ids); static struct platform_driver mxs_sgtl5000_audio_driver = { .driver = { .name = "mxs-sgtl5000", - .owner = THIS_MODULE, .of_match_table = mxs_sgtl5000_dt_ids, }, .probe = mxs_sgtl5000_probe, diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index dff443e4b657..b6615affe571 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -385,7 +385,6 @@ static int nuc900_ac97_drvremove(struct platform_device *pdev) static struct platform_driver nuc900_ac97_driver = { .driver = { .name = "nuc900-ac97", - .owner = THIS_MODULE, }, .probe = nuc900_ac97_drvprobe, .remove = nuc900_ac97_drvremove, diff --git a/sound/soc/nuc900/nuc900-pcm.c b/sound/soc/nuc900/nuc900-pcm.c index f434ed79d1b6..b779a3d9b5dd 100644 --- a/sound/soc/nuc900/nuc900-pcm.c +++ b/sound/soc/nuc900/nuc900-pcm.c @@ -347,7 +347,6 @@ static int nuc900_soc_platform_remove(struct platform_device *pdev) static struct platform_driver nuc900_pcm_driver = { .driver = { .name = "nuc900-pcm-audio", - .owner = THIS_MODULE, }, .probe = nuc900_soc_platform_probe, diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 2738b1984410..a2cd3486ac55 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -12,8 +12,20 @@ config SND_OMAP_SOC_MCBSP config SND_OMAP_SOC_MCPDM tristate -config SND_OMAP_SOC_HDMI - tristate +config SND_OMAP_SOC_HDMI_AUDIO + tristate "HDMI audio support for OMAP4+ based SoCs" + depends on SND_OMAP_SOC + help + For HDMI audio to work OMAPDSS HDMI support should be + enabled. + The hdmi audio driver implements cpu-dai component using the + callbacks provided by OMAPDSS and registers the component + under DSS HDMI device. Omap-pcm is registered for platform + component also under DSS HDMI device. Dummy codec is used as + as codec component. The hdmi audio driver implements also + the card and registers it under its own platform device. + The device for the dirver is registered by OMAPDSS hdmi + driver. config SND_OMAP_SOC_N810 tristate "SoC Audio support for Nokia N810" @@ -100,16 +112,6 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040 - PandaBoard (4430) - PandaBoardES (4460) -config SND_OMAP_SOC_OMAP_HDMI - tristate "SoC Audio support for Texas Instruments OMAP HDMI" - depends on SND_OMAP_SOC && OMAP4_DSS_HDMI && OMAP2_DSS - select SND_OMAP_SOC_HDMI - select SND_SOC_HDMI_CODEC - select OMAP4_DSS_HDMI_AUDIO - help - Say Y if you want to add support for SoC HDMI audio on Texas Instruments - OMAP4 chips - config SND_OMAP_SOC_OMAP3_PANDORA tristate "SoC Audio support for OMAP3 Pandora" depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_PANDORA diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index a725905b2c68..db36fbd5d1a0 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -3,13 +3,13 @@ snd-soc-omap-objs := omap-pcm.o snd-soc-omap-dmic-objs := omap-dmic.o snd-soc-omap-mcbsp-objs := omap-mcbsp.o mcbsp.o snd-soc-omap-mcpdm-objs := omap-mcpdm.o -snd-soc-omap-hdmi-objs := omap-hdmi.o +snd-soc-omap-hdmi-audio-objs := omap-hdmi-audio.o obj-$(CONFIG_SND_OMAP_SOC) += snd-soc-omap.o obj-$(CONFIG_SND_OMAP_SOC_DMIC) += snd-soc-omap-dmic.o obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o -obj-$(CONFIG_SND_OMAP_SOC_HDMI) += snd-soc-omap-hdmi.o +obj-$(CONFIG_SND_OMAP_SOC_HDMI_AUDIO) += snd-soc-omap-hdmi-audio.o # OMAP Machine Support snd-soc-n810-objs := n810.o @@ -20,7 +20,6 @@ snd-soc-am3517evm-objs := am3517evm.o snd-soc-omap-abe-twl6040-objs := omap-abe-twl6040.o snd-soc-omap-twl4030-objs := omap-twl4030.o snd-soc-omap3pandora-objs := omap3pandora.o -snd-soc-omap-hdmi-card-objs := omap-hdmi-card.o obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o obj-$(CONFIG_SND_OMAP_SOC_RX51) += snd-soc-rx51.o @@ -30,4 +29,3 @@ obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o obj-$(CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040) += snd-soc-omap-abe-twl6040.o obj-$(CONFIG_SND_OMAP_SOC_OMAP_TWL4030) += snd-soc-omap-twl4030.o obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o -obj-$(CONFIG_SND_OMAP_SOC_OMAP_HDMI) += snd-soc-omap-hdmi-card.o diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 8c9cc64a9dfb..4c6afb75eea6 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c @@ -599,7 +599,6 @@ static int ams_delta_remove(struct platform_device *pdev) static struct platform_driver ams_delta_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, }, .probe = ams_delta_probe, .remove = ams_delta_remove, diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index cec836ed0c01..b9c65f1ad5a8 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -354,7 +354,6 @@ MODULE_DEVICE_TABLE(of, omap_abe_of_match); static struct platform_driver omap_abe_driver = { .driver = { .name = "omap-abe-twl6040", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = omap_abe_of_match, }, diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 0f34e28a3d55..09db2aec12a3 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -509,7 +509,6 @@ MODULE_DEVICE_TABLE(of, omap_dmic_of_match); static struct platform_driver asoc_dmic_driver = { .driver = { .name = "omap-dmic", - .owner = THIS_MODULE, .of_match_table = omap_dmic_of_match, }, .probe = asoc_dmic_probe, diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/omap/omap-hdmi-audio.c new file mode 100644 index 000000000000..3f9ac7dbdc80 --- /dev/null +++ b/sound/soc/omap/omap-hdmi-audio.c @@ -0,0 +1,407 @@ +/* + * omap-hdmi-audio.c -- OMAP4+ DSS HDMI audio support library + * + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com + * + * Author: Jyri Sarha <jsarha@ti.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/string.h> +#include <linux/platform_device.h> +#include <sound/soc.h> +#include <sound/pcm_params.h> +#include <sound/dmaengine_pcm.h> +#include <uapi/sound/asound.h> +#include <sound/asoundef.h> +#include <sound/omap-pcm.h> +#include <sound/omap-hdmi-audio.h> +#include <video/omapdss.h> + +#define DRV_NAME "omap-hdmi-audio" + +struct hdmi_audio_data { + struct snd_soc_card *card; + + const struct omap_hdmi_audio_ops *ops; + struct device *dssdev; + struct snd_dmaengine_dai_dma_data dma_data; + struct omap_dss_audio dss_audio; + struct snd_aes_iec958 iec; + struct snd_cea_861_aud_if cea; + + struct mutex current_stream_lock; + struct snd_pcm_substream *current_stream; +}; + +static +struct hdmi_audio_data *card_drvdata_substream(struct snd_pcm_substream *ss) +{ + struct snd_soc_pcm_runtime *rtd = ss->private_data; + + return snd_soc_card_get_drvdata(rtd->card); +} + +static void hdmi_dai_abort(struct device *dev) +{ + struct hdmi_audio_data *ad = dev_get_drvdata(dev); + + mutex_lock(&ad->current_stream_lock); + if (ad->current_stream && ad->current_stream->runtime && + snd_pcm_running(ad->current_stream)) { + dev_err(dev, "HDMI display disabled, aborting playback\n"); + snd_pcm_stream_lock_irq(ad->current_stream); + snd_pcm_stop(ad->current_stream, SNDRV_PCM_STATE_DISCONNECTED); + snd_pcm_stream_unlock_irq(ad->current_stream); + } + mutex_unlock(&ad->current_stream_lock); +} + +static int hdmi_dai_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct hdmi_audio_data *ad = card_drvdata_substream(substream); + int ret; + /* + * Make sure that the period bytes are multiple of the DMA packet size. + * Largest packet size we use is 32 32-bit words = 128 bytes + */ + ret = snd_pcm_hw_constraint_step(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 128); + if (ret < 0) { + dev_err(dai->dev, "could not apply constraint\n"); + return ret; + } + + snd_soc_dai_set_dma_data(dai, substream, &ad->dma_data); + + mutex_lock(&ad->current_stream_lock); + ad->current_stream = substream; + mutex_unlock(&ad->current_stream_lock); + + ret = ad->ops->audio_startup(ad->dssdev, hdmi_dai_abort); + + if (ret) { + mutex_lock(&ad->current_stream_lock); + ad->current_stream = NULL; + mutex_unlock(&ad->current_stream_lock); + } + + return ret; +} + +static int hdmi_dai_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct hdmi_audio_data *ad = card_drvdata_substream(substream); + struct snd_aes_iec958 *iec = &ad->iec; + struct snd_cea_861_aud_if *cea = &ad->cea; + + WARN_ON(ad->current_stream != substream); + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + ad->dma_data.maxburst = 16; + break; + case SNDRV_PCM_FORMAT_S24_LE: + ad->dma_data.maxburst = 32; + break; + default: + dev_err(dai->dev, "format not supported!\n"); + return -EINVAL; + } + + ad->dss_audio.iec = iec; + ad->dss_audio.cea = cea; + /* + * fill the IEC-60958 channel status word + */ + /* initialize the word bytes */ + memset(iec->status, 0, sizeof(iec->status)); + + /* specify IEC-60958-3 (commercial use) */ + iec->status[0] &= ~IEC958_AES0_PROFESSIONAL; + + /* specify that the audio is LPCM*/ + iec->status[0] &= ~IEC958_AES0_NONAUDIO; + + iec->status[0] |= IEC958_AES0_CON_NOT_COPYRIGHT; + + iec->status[0] |= IEC958_AES0_CON_EMPHASIS_NONE; + + iec->status[0] |= IEC958_AES1_PRO_MODE_NOTID; + + iec->status[1] = IEC958_AES1_CON_GENERAL; + + iec->status[2] |= IEC958_AES2_CON_SOURCE_UNSPEC; + + iec->status[2] |= IEC958_AES2_CON_CHANNEL_UNSPEC; + + switch (params_rate(params)) { + case 32000: + iec->status[3] |= IEC958_AES3_CON_FS_32000; + break; + case 44100: + iec->status[3] |= IEC958_AES3_CON_FS_44100; + break; + case 48000: + iec->status[3] |= IEC958_AES3_CON_FS_48000; + break; + case 88200: + iec->status[3] |= IEC958_AES3_CON_FS_88200; + break; + case 96000: + iec->status[3] |= IEC958_AES3_CON_FS_96000; + break; + case 176400: + iec->status[3] |= IEC958_AES3_CON_FS_176400; + break; + case 192000: + iec->status[3] |= IEC958_AES3_CON_FS_192000; + break; + default: + dev_err(dai->dev, "rate not supported!\n"); + return -EINVAL; + } + + /* specify the clock accuracy */ + iec->status[3] |= IEC958_AES3_CON_CLOCK_1000PPM; + + /* + * specify the word length. The same word length value can mean + * two different lengths. Hence, we need to specify the maximum + * word length as well. + */ + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + iec->status[4] |= IEC958_AES4_CON_WORDLEN_20_16; + iec->status[4] &= ~IEC958_AES4_CON_MAX_WORDLEN_24; + break; + case SNDRV_PCM_FORMAT_S24_LE: + iec->status[4] |= IEC958_AES4_CON_WORDLEN_24_20; + iec->status[4] |= IEC958_AES4_CON_MAX_WORDLEN_24; + break; + default: + dev_err(dai->dev, "format not supported!\n"); + return -EINVAL; + } + + /* + * Fill the CEA-861 audio infoframe (see spec for details) + */ + + cea->db1_ct_cc = (params_channels(params) - 1) + & CEA861_AUDIO_INFOFRAME_DB1CC; + cea->db1_ct_cc |= CEA861_AUDIO_INFOFRAME_DB1CT_FROM_STREAM; + + cea->db2_sf_ss = CEA861_AUDIO_INFOFRAME_DB2SF_FROM_STREAM; + cea->db2_sf_ss |= CEA861_AUDIO_INFOFRAME_DB2SS_FROM_STREAM; + + cea->db3 = 0; /* not used, all zeros */ + + /* + * The OMAP HDMI IP requires to use the 8-channel channel code when + * transmitting more than two channels. + */ + if (params_channels(params) == 2) + cea->db4_ca = 0x0; + else + cea->db4_ca = 0x13; + + cea->db5_dminh_lsv = CEA861_AUDIO_INFOFRAME_DB5_DM_INH_PROHIBITED; + /* the expression is trivial but makes clear what we are doing */ + cea->db5_dminh_lsv |= (0 & CEA861_AUDIO_INFOFRAME_DB5_LSV); + + return ad->ops->audio_config(ad->dssdev, &ad->dss_audio); +} + +static int hdmi_dai_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct hdmi_audio_data *ad = card_drvdata_substream(substream); + int err = 0; + + WARN_ON(ad->current_stream != substream); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + err = ad->ops->audio_start(ad->dssdev); + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + ad->ops->audio_stop(ad->dssdev); + break; + default: + err = -EINVAL; + } + return err; +} + +static void hdmi_dai_shutdown(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct hdmi_audio_data *ad = card_drvdata_substream(substream); + + WARN_ON(ad->current_stream != substream); + + ad->ops->audio_shutdown(ad->dssdev); + + mutex_lock(&ad->current_stream_lock); + ad->current_stream = NULL; + mutex_unlock(&ad->current_stream_lock); +} + +static const struct snd_soc_dai_ops hdmi_dai_ops = { + .startup = hdmi_dai_startup, + .hw_params = hdmi_dai_hw_params, + .trigger = hdmi_dai_trigger, + .shutdown = hdmi_dai_shutdown, +}; + +static const struct snd_soc_component_driver omap_hdmi_component = { + .name = "omapdss_hdmi", +}; + +static struct snd_soc_dai_driver omap5_hdmi_dai = { + .name = "omap5-hdmi-dai", + .playback = { + .channels_min = 2, + .channels_max = 8, + .rates = (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | + SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 | + SNDRV_PCM_RATE_192000), + .formats = SNDRV_PCM_FMTBIT_S16_LE, + }, + .ops = &hdmi_dai_ops, +}; + +static struct snd_soc_dai_driver omap4_hdmi_dai = { + .name = "omap4-hdmi-dai", + .playback = { + .channels_min = 2, + .channels_max = 8, + .rates = (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | + SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 | + SNDRV_PCM_RATE_192000), + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE, + }, + .ops = &hdmi_dai_ops, +}; + +static int omap_hdmi_audio_probe(struct platform_device *pdev) +{ + struct omap_hdmi_audio_pdata *ha = pdev->dev.platform_data; + struct device *dev = &pdev->dev; + struct hdmi_audio_data *ad; + struct snd_soc_dai_driver *dai_drv; + struct snd_soc_card *card; + int ret; + + if (!ha) { + dev_err(dev, "No platform data\n"); + return -EINVAL; + } + + ad = devm_kzalloc(dev, sizeof(*ad), GFP_KERNEL); + if (!ad) + return -ENOMEM; + ad->dssdev = ha->dev; + ad->ops = ha->ops; + ad->dma_data.addr = ha->audio_dma_addr; + ad->dma_data.filter_data = "audio_tx"; + ad->dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + mutex_init(&ad->current_stream_lock); + + switch (ha->dss_version) { + case OMAPDSS_VER_OMAP4430_ES1: + case OMAPDSS_VER_OMAP4430_ES2: + case OMAPDSS_VER_OMAP4: + dai_drv = &omap4_hdmi_dai; + break; + case OMAPDSS_VER_OMAP5: + dai_drv = &omap5_hdmi_dai; + break; + default: + return -EINVAL; + } + ret = snd_soc_register_component(ad->dssdev, &omap_hdmi_component, + dai_drv, 1); + if (ret) + return ret; + + ret = omap_pcm_platform_register(ad->dssdev); + if (ret) + return ret; + + card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL); + card->name = devm_kasprintf(dev, GFP_KERNEL, + "HDMI %s", dev_name(ad->dssdev)); + card->owner = THIS_MODULE; + card->dai_link = + devm_kzalloc(dev, sizeof(*(card->dai_link)), GFP_KERNEL); + card->dai_link->name = card->name; + card->dai_link->stream_name = card->name; + card->dai_link->cpu_dai_name = dev_name(ad->dssdev); + card->dai_link->platform_name = dev_name(ad->dssdev); + card->dai_link->codec_name = "snd-soc-dummy"; + card->dai_link->codec_dai_name = "snd-soc-dummy-dai"; + card->num_links = 1; + card->dev = dev; + + ret = snd_soc_register_card(card); + if (ret) { + dev_err(dev, "snd_soc_register_card failed (%d)\n", ret); + snd_soc_unregister_component(ad->dssdev); + return ret; + } + + ad->card = card; + snd_soc_card_set_drvdata(card, ad); + + dev_set_drvdata(dev, ad); + + return 0; +} + +static int omap_hdmi_audio_remove(struct platform_device *pdev) +{ + struct hdmi_audio_data *ad = platform_get_drvdata(pdev); + + snd_soc_unregister_card(ad->card); + snd_soc_unregister_component(ad->dssdev); + return 0; +} + +static struct platform_driver hdmi_audio_driver = { + .driver = { + .name = DRV_NAME, + .owner = THIS_MODULE, + }, + .probe = omap_hdmi_audio_probe, + .remove = omap_hdmi_audio_remove, +}; + +module_platform_driver(hdmi_audio_driver); + +MODULE_AUTHOR("Jyri Sarha <jsarha@ti.com>"); +MODULE_DESCRIPTION("OMAP HDMI Audio Driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/omap/omap-hdmi-card.c b/sound/soc/omap/omap-hdmi-card.c deleted file mode 100644 index f649fe84b629..000000000000 --- a/sound/soc/omap/omap-hdmi-card.c +++ /dev/null @@ -1,87 +0,0 @@ -/* - * omap-hdmi-card.c - * - * OMAP ALSA SoC machine driver for TI OMAP HDMI - * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ - * Author: Ricardo Neri <ricardo.neri@ti.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * - */ - -#include <linux/module.h> -#include <sound/pcm.h> -#include <sound/soc.h> -#include <asm/mach-types.h> -#include <video/omapdss.h> - -#define DRV_NAME "omap-hdmi-audio" - -static struct snd_soc_dai_link omap_hdmi_dai = { - .name = "HDMI", - .stream_name = "HDMI", - .cpu_dai_name = "omap-hdmi-audio-dai", - .platform_name = "omap-hdmi-audio-dai", - .codec_name = "hdmi-audio-codec", - .codec_dai_name = "hdmi-hifi", -}; - -static struct snd_soc_card snd_soc_omap_hdmi = { - .name = "OMAPHDMI", - .owner = THIS_MODULE, - .dai_link = &omap_hdmi_dai, - .num_links = 1, -}; - -static int omap_hdmi_probe(struct platform_device *pdev) -{ - struct snd_soc_card *card = &snd_soc_omap_hdmi; - int ret; - - card->dev = &pdev->dev; - - ret = snd_soc_register_card(card); - if (ret) { - dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); - card->dev = NULL; - return ret; - } - return 0; -} - -static int omap_hdmi_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); - card->dev = NULL; - return 0; -} - -static struct platform_driver omap_hdmi_driver = { - .driver = { - .name = DRV_NAME, - .owner = THIS_MODULE, - }, - .probe = omap_hdmi_probe, - .remove = omap_hdmi_remove, -}; - -module_platform_driver(omap_hdmi_driver); - -MODULE_AUTHOR("Ricardo Neri <ricardo.neri@ti.com>"); -MODULE_DESCRIPTION("OMAP HDMI machine ASoC driver"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c deleted file mode 100644 index eb9c39299f81..000000000000 --- a/sound/soc/omap/omap-hdmi.c +++ /dev/null @@ -1,364 +0,0 @@ -/* - * omap-hdmi.c - * - * OMAP ALSA SoC DAI driver for HDMI audio on OMAP4 processors. - * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/ - * Authors: Jorge Candelaria <jorge.candelaria@ti.com> - * Ricardo Neri <ricardo.neri@ti.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * - */ - -#include <linux/init.h> -#include <linux/module.h> -#include <linux/device.h> -#include <sound/core.h> -#include <sound/pcm.h> -#include <sound/pcm_params.h> -#include <sound/initval.h> -#include <sound/soc.h> -#include <sound/asound.h> -#include <sound/asoundef.h> -#include <sound/dmaengine_pcm.h> -#include <video/omapdss.h> -#include <sound/omap-pcm.h> - -#include "omap-hdmi.h" - -#define DRV_NAME "omap-hdmi-audio-dai" - -struct hdmi_priv { - struct snd_dmaengine_dai_dma_data dma_data; - unsigned int dma_req; - struct omap_dss_audio dss_audio; - struct snd_aes_iec958 iec; - struct snd_cea_861_aud_if cea; - struct omap_dss_device *dssdev; -}; - -static int omap_hdmi_dai_startup(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct hdmi_priv *priv = snd_soc_dai_get_drvdata(dai); - int err; - /* - * Make sure that the period bytes are multiple of the DMA packet size. - * Largest packet size we use is 32 32-bit words = 128 bytes - */ - err = snd_pcm_hw_constraint_step(substream->runtime, 0, - SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 128); - if (err < 0) { - dev_err(dai->dev, "could not apply constraint\n"); - return err; - } - - if (!priv->dssdev->driver->audio_supported(priv->dssdev)) { - dev_err(dai->dev, "audio not supported\n"); - return -ENODEV; - } - - snd_soc_dai_set_dma_data(dai, substream, &priv->dma_data); - - return 0; -} - -static int omap_hdmi_dai_prepare(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct hdmi_priv *priv = snd_soc_dai_get_drvdata(dai); - - return priv->dssdev->driver->audio_enable(priv->dssdev); -} - -static int omap_hdmi_dai_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, - struct snd_soc_dai *dai) -{ - struct hdmi_priv *priv = snd_soc_dai_get_drvdata(dai); - struct snd_aes_iec958 *iec = &priv->iec; - struct snd_cea_861_aud_if *cea = &priv->cea; - int err = 0; - - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: - priv->dma_data.maxburst = 16; - break; - case SNDRV_PCM_FORMAT_S24_LE: - priv->dma_data.maxburst = 32; - break; - default: - dev_err(dai->dev, "format not supported!\n"); - return -EINVAL; - } - - /* - * fill the IEC-60958 channel status word - */ - /* initialize the word bytes */ - memset(iec->status, 0, sizeof(iec->status)); - - /* specify IEC-60958-3 (commercial use) */ - iec->status[0] &= ~IEC958_AES0_PROFESSIONAL; - - /* specify that the audio is LPCM*/ - iec->status[0] &= ~IEC958_AES0_NONAUDIO; - - iec->status[0] |= IEC958_AES0_CON_NOT_COPYRIGHT; - - iec->status[0] |= IEC958_AES0_CON_EMPHASIS_NONE; - - iec->status[0] |= IEC958_AES1_PRO_MODE_NOTID; - - iec->status[1] = IEC958_AES1_CON_GENERAL; - - iec->status[2] |= IEC958_AES2_CON_SOURCE_UNSPEC; - - iec->status[2] |= IEC958_AES2_CON_CHANNEL_UNSPEC; - - switch (params_rate(params)) { - case 32000: - iec->status[3] |= IEC958_AES3_CON_FS_32000; - break; - case 44100: - iec->status[3] |= IEC958_AES3_CON_FS_44100; - break; - case 48000: - iec->status[3] |= IEC958_AES3_CON_FS_48000; - break; - case 88200: - iec->status[3] |= IEC958_AES3_CON_FS_88200; - break; - case 96000: - iec->status[3] |= IEC958_AES3_CON_FS_96000; - break; - case 176400: - iec->status[3] |= IEC958_AES3_CON_FS_176400; - break; - case 192000: - iec->status[3] |= IEC958_AES3_CON_FS_192000; - break; - default: - dev_err(dai->dev, "rate not supported!\n"); - return -EINVAL; - } - - /* specify the clock accuracy */ - iec->status[3] |= IEC958_AES3_CON_CLOCK_1000PPM; - - /* - * specify the word length. The same word length value can mean - * two different lengths. Hence, we need to specify the maximum - * word length as well. - */ - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: - iec->status[4] |= IEC958_AES4_CON_WORDLEN_20_16; - iec->status[4] &= ~IEC958_AES4_CON_MAX_WORDLEN_24; - break; - case SNDRV_PCM_FORMAT_S24_LE: - iec->status[4] |= IEC958_AES4_CON_WORDLEN_24_20; - iec->status[4] |= IEC958_AES4_CON_MAX_WORDLEN_24; - break; - default: - dev_err(dai->dev, "format not supported!\n"); - return -EINVAL; - } - - /* - * Fill the CEA-861 audio infoframe (see spec for details) - */ - - cea->db1_ct_cc = (params_channels(params) - 1) - & CEA861_AUDIO_INFOFRAME_DB1CC; - cea->db1_ct_cc |= CEA861_AUDIO_INFOFRAME_DB1CT_FROM_STREAM; - - cea->db2_sf_ss = CEA861_AUDIO_INFOFRAME_DB2SF_FROM_STREAM; - cea->db2_sf_ss |= CEA861_AUDIO_INFOFRAME_DB2SS_FROM_STREAM; - - cea->db3 = 0; /* not used, all zeros */ - - /* - * The OMAP HDMI IP requires to use the 8-channel channel code when - * transmitting more than two channels. - */ - if (params_channels(params) == 2) - cea->db4_ca = 0x0; - else - cea->db4_ca = 0x13; - - cea->db5_dminh_lsv = CEA861_AUDIO_INFOFRAME_DB5_DM_INH_PROHIBITED; - /* the expression is trivial but makes clear what we are doing */ - cea->db5_dminh_lsv |= (0 & CEA861_AUDIO_INFOFRAME_DB5_LSV); - - priv->dss_audio.iec = iec; - priv->dss_audio.cea = cea; - - err = priv->dssdev->driver->audio_config(priv->dssdev, - &priv->dss_audio); - - return err; -} - -static int omap_hdmi_dai_trigger(struct snd_pcm_substream *substream, int cmd, - struct snd_soc_dai *dai) -{ - struct hdmi_priv *priv = snd_soc_dai_get_drvdata(dai); - int err = 0; - - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - err = priv->dssdev->driver->audio_start(priv->dssdev); - break; - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - priv->dssdev->driver->audio_stop(priv->dssdev); - break; - default: - err = -EINVAL; - } - return err; -} - -static void omap_hdmi_dai_shutdown(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct hdmi_priv *priv = snd_soc_dai_get_drvdata(dai); - - priv->dssdev->driver->audio_disable(priv->dssdev); -} - -static const struct snd_soc_dai_ops omap_hdmi_dai_ops = { - .startup = omap_hdmi_dai_startup, - .hw_params = omap_hdmi_dai_hw_params, - .prepare = omap_hdmi_dai_prepare, - .trigger = omap_hdmi_dai_trigger, - .shutdown = omap_hdmi_dai_shutdown, -}; - -static struct snd_soc_dai_driver omap_hdmi_dai = { - .playback = { - .channels_min = 2, - .channels_max = 8, - .rates = OMAP_HDMI_RATES, - .formats = OMAP_HDMI_FORMATS, - }, - .ops = &omap_hdmi_dai_ops, -}; - -static const struct snd_soc_component_driver omap_hdmi_component = { - .name = DRV_NAME, -}; - -static int omap_hdmi_probe(struct platform_device *pdev) -{ - int ret; - struct resource *hdmi_rsrc; - struct hdmi_priv *hdmi_data; - bool hdmi_dev_found = false; - - hdmi_data = devm_kzalloc(&pdev->dev, sizeof(*hdmi_data), GFP_KERNEL); - if (hdmi_data == NULL) { - dev_err(&pdev->dev, "Cannot allocate memory for HDMI data\n"); - return -ENOMEM; - } - - hdmi_rsrc = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!hdmi_rsrc) { - dev_err(&pdev->dev, "Cannot obtain IORESOURCE_MEM HDMI\n"); - return -ENODEV; - } - - hdmi_data->dma_data.addr = hdmi_rsrc->start + OMAP_HDMI_AUDIO_DMA_PORT; - - hdmi_rsrc = platform_get_resource(pdev, IORESOURCE_DMA, 0); - if (!hdmi_rsrc) { - dev_err(&pdev->dev, "Cannot obtain IORESOURCE_DMA HDMI\n"); - return -ENODEV; - } - - hdmi_data->dma_req = hdmi_rsrc->start; - hdmi_data->dma_data.filter_data = &hdmi_data->dma_req; - hdmi_data->dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; - - /* - * TODO: We assume that there is only one DSS HDMI device. Future - * OMAP implementations may support more than one HDMI devices and - * we should provided separate audio support for all of them. - */ - /* Find an HDMI device. */ - for_each_dss_dev(hdmi_data->dssdev) { - omap_dss_get_device(hdmi_data->dssdev); - - if (!hdmi_data->dssdev->driver) { - omap_dss_put_device(hdmi_data->dssdev); - continue; - } - - if (hdmi_data->dssdev->type == OMAP_DISPLAY_TYPE_HDMI) { - hdmi_dev_found = true; - break; - } - } - - if (!hdmi_dev_found) { - dev_err(&pdev->dev, "no driver for HDMI display found\n"); - return -ENODEV; - } - - dev_set_drvdata(&pdev->dev, hdmi_data); - ret = snd_soc_register_component(&pdev->dev, &omap_hdmi_component, - &omap_hdmi_dai, 1); - - if (ret) - return ret; - - return omap_pcm_platform_register(&pdev->dev); -} - -static int omap_hdmi_remove(struct platform_device *pdev) -{ - struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev); - - snd_soc_unregister_component(&pdev->dev); - - if (hdmi_data == NULL) { - dev_err(&pdev->dev, "cannot obtain HDMi data\n"); - return -ENODEV; - } - - omap_dss_put_device(hdmi_data->dssdev); - return 0; -} - -static struct platform_driver hdmi_dai_driver = { - .driver = { - .name = DRV_NAME, - .owner = THIS_MODULE, - }, - .probe = omap_hdmi_probe, - .remove = omap_hdmi_remove, -}; - -module_platform_driver(hdmi_dai_driver); - -MODULE_AUTHOR("Jorge Candelaria <jorge.candelaria@ti.com>"); -MODULE_AUTHOR("Ricardo Neri <ricardo.neri@ti.com>"); -MODULE_DESCRIPTION("OMAP HDMI SoC Interface"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/omap/omap-hdmi.h b/sound/soc/omap/omap-hdmi.h deleted file mode 100644 index 6ad2bf4f2697..000000000000 --- a/sound/soc/omap/omap-hdmi.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * omap-hdmi.h - * - * Definitions for OMAP ALSA SoC DAI driver for HDMI audio on OMAP4 processors. - * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/ - * Authors: Jorge Candelaria <jorge.candelaria@ti.com> - * Ricardo Neri <ricardo.neri@ti.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * - */ - -#ifndef __OMAP_HDMI_H__ -#define __OMAP_HDMI_H__ - -#define OMAP_HDMI_AUDIO_DMA_PORT 0x8c - -#define OMAP_HDMI_RATES (SNDRV_PCM_RATE_32000 | \ - SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | \ - SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | \ - SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000) - -#define OMAP_HDMI_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ - SNDRV_PCM_FMTBIT_S24_LE) - -#endif diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index bd3ef2a88be0..8b79cafab1e2 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -831,7 +831,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) static struct platform_driver asoc_mcbsp_driver = { .driver = { .name = "omap-mcbsp", - .owner = THIS_MODULE, .of_match_table = omap_mcbsp_of_match, }, diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index f0e2ebeab02b..b837265ac3e9 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -512,7 +512,6 @@ MODULE_DEVICE_TABLE(of, omap_mcpdm_of_match); static struct platform_driver asoc_mcpdm_driver = { .driver = { .name = "omap-mcpdm", - .owner = THIS_MODULE, .of_match_table = omap_mcpdm_of_match, }, diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c index 4336d1831485..5e551c762b7a 100644 --- a/sound/soc/omap/omap-twl4030.c +++ b/sound/soc/omap/omap-twl4030.c @@ -375,7 +375,6 @@ MODULE_DEVICE_TABLE(of, omap_twl4030_of_match); static struct platform_driver omap_twl4030_driver = { .driver = { .name = "omap-twl4030", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = omap_twl4030_of_match, }, diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index b10ae8074461..04896d6252a2 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c @@ -519,7 +519,6 @@ MODULE_DEVICE_TABLE(of, rx51_audio_of_match); static struct platform_driver rx51_soc_driver = { .driver = { .name = "rx51-audio", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(rx51_audio_of_match), }, .probe = rx51_soc_probe, diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c index c8dd53f9c35d..79936e3e80e7 100644 --- a/sound/soc/pxa/brownstone.c +++ b/sound/soc/pxa/brownstone.c @@ -155,7 +155,6 @@ static int brownstone_remove(struct platform_device *pdev) static struct platform_driver mmp_driver = { .driver = { .name = "brownstone-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = brownstone_probe, diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 5a88136aa800..b7cd0a71fd70 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c @@ -327,7 +327,6 @@ static int corgi_remove(struct platform_device *pdev) static struct platform_driver corgi_driver = { .driver = { .name = "corgi-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = corgi_probe, diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c index c29fedab2f49..7c691aae8af2 100644 --- a/sound/soc/pxa/e740_wm9705.c +++ b/sound/soc/pxa/e740_wm9705.c @@ -177,7 +177,6 @@ static int e740_remove(struct platform_device *pdev) static struct platform_driver e740_driver = { .driver = { .name = "e740-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = e740_probe, diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c index ee36aba88063..30544b65b5a8 100644 --- a/sound/soc/pxa/e750_wm9705.c +++ b/sound/soc/pxa/e750_wm9705.c @@ -159,7 +159,6 @@ static int e750_remove(struct platform_device *pdev) static struct platform_driver e750_driver = { .driver = { .name = "e750-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = e750_probe, diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c index 24c2078ce70b..45d4bd46fff6 100644 --- a/sound/soc/pxa/e800_wm9712.c +++ b/sound/soc/pxa/e800_wm9712.c @@ -140,7 +140,6 @@ static int e800_remove(struct platform_device *pdev) static struct platform_driver e800_driver = { .driver = { .name = "e800-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = e800_probe, diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c index 05559a725bec..ce26551052a3 100644 --- a/sound/soc/pxa/hx4700.c +++ b/sound/soc/pxa/hx4700.c @@ -226,7 +226,6 @@ static int hx4700_audio_remove(struct platform_device *pdev) static struct platform_driver hx4700_audio_driver = { .driver = { .name = "hx4700-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = hx4700_audio_probe, diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c index fd2f4eda1fd3..29fabbfd21f1 100644 --- a/sound/soc/pxa/imote2.c +++ b/sound/soc/pxa/imote2.c @@ -90,7 +90,6 @@ static int imote2_remove(struct platform_device *pdev) static struct platform_driver imote2_driver = { .driver = { .name = "imote2-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = imote2_probe, diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c index a6b2be20cc0b..396dbd51a64f 100644 --- a/sound/soc/pxa/mioa701_wm9713.c +++ b/sound/soc/pxa/mioa701_wm9713.c @@ -202,7 +202,6 @@ static struct platform_driver mioa701_wm9713_driver = { .remove = mioa701_wm9713_remove, .driver = { .name = "mioa701-wm9713", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, }; diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c index 64e8b949a1a3..1eb45dcfb8e8 100644 --- a/sound/soc/pxa/mmp-pcm.c +++ b/sound/soc/pxa/mmp-pcm.c @@ -244,7 +244,6 @@ static int mmp_pcm_remove(struct platform_device *pdev) static struct platform_driver mmp_pcm_driver = { .driver = { .name = "mmp-pcm-audio", - .owner = THIS_MODULE, }, .probe = mmp_pcm_probe, diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c index 5bf5f1f7cac5..eca60c29791a 100644 --- a/sound/soc/pxa/mmp-sspa.c +++ b/sound/soc/pxa/mmp-sspa.c @@ -472,7 +472,6 @@ static int asoc_mmp_sspa_remove(struct platform_device *pdev) static struct platform_driver asoc_mmp_sspa_driver = { .driver = { .name = "mmp-sspa-dai", - .owner = THIS_MODULE, }, .probe = asoc_mmp_sspa_probe, .remove = asoc_mmp_sspa_remove, diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index 17f9521ff6ea..1eebca2f0a97 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c @@ -172,7 +172,6 @@ static struct platform_driver palm27x_wm9712_driver = { .remove = palm27x_asoc_remove, .driver = { .name = "palm27x-asoc", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, }; diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 21f340065318..0fce8c420e96 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c @@ -296,7 +296,6 @@ static int poodle_remove(struct platform_device *pdev) static struct platform_driver poodle_driver = { .driver = { .name = "poodle-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = poodle_probe, diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index cbba063a7210..fbe2e93d6edc 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -826,7 +826,6 @@ static int asoc_ssp_remove(struct platform_device *pdev) static struct platform_driver asoc_ssp_driver = { .driver = { .name = "pxa-ssp-dai", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(pxa_ssp_of_ids), }, diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 73ca2820c08c..1f6054650991 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -261,7 +261,6 @@ static struct platform_driver pxa2xx_ac97_driver = { .remove = pxa2xx_ac97_dev_remove, .driver = { .name = "pxa2xx-ac97", - .owner = THIS_MODULE, #ifdef CONFIG_PM_SLEEP .pm = &pxa2xx_ac97_pm_ops, #endif diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index c0d648d3339f..e68290c15328 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -383,7 +383,6 @@ static struct platform_driver pxa2xx_i2s_driver = { .driver = { .name = "pxa2xx-i2s", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index 42f2f0175981..a51c9da66614 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c @@ -143,7 +143,6 @@ static const struct of_device_id snd_soc_pxa_audio_match[] = { static struct platform_driver pxa_pcm_driver = { .driver = { .name = "pxa-pcm-audio", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(snd_soc_pxa_audio_match), }, diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index 4a956d1cb269..cb49284e853a 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c @@ -265,7 +265,6 @@ static int tosa_remove(struct platform_device *pdev) static struct platform_driver tosa_driver = { .driver = { .name = "tosa-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = tosa_probe, diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c index 9d7c5b7e9539..e3d7257ad09c 100644 --- a/sound/soc/pxa/ttc-dkb.c +++ b/sound/soc/pxa/ttc-dkb.c @@ -155,7 +155,6 @@ static int ttc_dkb_remove(struct platform_device *pdev) static struct platform_driver ttc_dkb_driver = { .driver = { .name = "ttc-dkb-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = ttc_dkb_probe, diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index c74ba37f862c..26ec5117b35c 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -528,7 +528,6 @@ static struct platform_driver rockchip_i2s_driver = { .remove = rockchip_i2s_remove, .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = of_match_ptr(rockchip_i2s_match), .pm = &rockchip_i2s_pm_ops, }, diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index 7952a625669d..e4145509d63c 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c @@ -442,7 +442,6 @@ static struct platform_driver s3c_ac97_driver = { .remove = s3c_ac97_remove, .driver = { .name = "samsung-ac97", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c index 5b21207cf551..e5f05e62fa3c 100644 --- a/sound/soc/samsung/bells.c +++ b/sound/soc/samsung/bells.c @@ -445,7 +445,6 @@ static int bells_probe(struct platform_device *pdev) static struct platform_driver bells_driver = { .driver = { .name = "bells", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = bells_probe, diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index eca17dc01ef7..b5a80c528d86 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1135,7 +1135,7 @@ static inline const struct samsung_i2s_dai_data *samsung_i2s_get_driver_data( platform_get_device_id(pdev)->driver_data; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int i2s_runtime_suspend(struct device *dev) { struct i2s_dai *i2s = dev_get_drvdata(dev); @@ -1153,7 +1153,7 @@ static int i2s_runtime_resume(struct device *dev) return 0; } -#endif /* CONFIG_PM_RUNTIME */ +#endif /* CONFIG_PM */ static int samsung_i2s_probe(struct platform_device *pdev) { @@ -1472,7 +1472,6 @@ static struct platform_driver samsung_i2s_driver = { .id_table = samsung_i2s_driver_ids, .driver = { .name = "samsung-i2s", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(exynos_i2s_match), .pm = &samsung_i2s_pm, }, diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c index 0e8dd985fcb3..4ed29ffc1c54 100644 --- a/sound/soc/samsung/idma.c +++ b/sound/soc/samsung/idma.c @@ -418,7 +418,6 @@ static int asoc_idma_platform_probe(struct platform_device *pdev) static struct platform_driver asoc_idma_driver = { .driver = { .name = "samsung-idma", - .owner = THIS_MODULE, }, .probe = asoc_idma_platform_probe, diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c index 840787e63cb1..141519c21e21 100644 --- a/sound/soc/samsung/littlemill.c +++ b/sound/soc/samsung/littlemill.c @@ -315,7 +315,6 @@ static int littlemill_probe(struct platform_device *pdev) static struct platform_driver littlemill_driver = { .driver = { .name = "littlemill", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = littlemill_probe, diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c index bd5f0d643a86..243dea7ba38f 100644 --- a/sound/soc/samsung/lowland.c +++ b/sound/soc/samsung/lowland.c @@ -198,7 +198,6 @@ static int lowland_probe(struct platform_device *pdev) static struct platform_driver lowland_driver = { .driver = { .name = "lowland", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = lowland_probe, diff --git a/sound/soc/samsung/odroidx2_max98090.c b/sound/soc/samsung/odroidx2_max98090.c index d7640e72cb1d..fa4f1d2f69bf 100644 --- a/sound/soc/samsung/odroidx2_max98090.c +++ b/sound/soc/samsung/odroidx2_max98090.c @@ -162,7 +162,6 @@ static int odroidx2_audio_remove(struct platform_device *pdev) static struct platform_driver odroidx2_audio_driver = { .driver = { .name = "odroidx2-audio", - .owner = THIS_MODULE, .of_match_table = odroidx2_audio_of_match, .pm = &snd_soc_pm_ops, }, diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index bac034b15a27..b320a9d3fbf8 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -626,7 +626,6 @@ static struct platform_driver s3c_pcm_driver = { .remove = s3c_pcm_dev_remove, .driver = { .name = "samsung-pcm", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 27b339c6580e..2b766d212ce0 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -180,7 +180,6 @@ static struct platform_driver s3c2412_iis_driver = { .probe = s3c2412_iis_dev_probe, .driver = { .name = "s3c2412-iis", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index e87d9a2053b8..326d3c3804e3 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -485,7 +485,6 @@ static struct platform_driver s3c24xx_iis_driver = { .probe = s3c24xx_iis_dev_probe, .driver = { .name = "s3c24xx-iis", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/samsung/s3c24xx_simtec_hermes.c b/sound/soc/samsung/s3c24xx_simtec_hermes.c index 2d30b7b6818a..7ac924c595bf 100644 --- a/sound/soc/samsung/s3c24xx_simtec_hermes.c +++ b/sound/soc/samsung/s3c24xx_simtec_hermes.c @@ -99,7 +99,6 @@ static int simtec_audio_hermes_probe(struct platform_device *pd) static struct platform_driver simtec_audio_hermes_platdrv = { .driver = { - .owner = THIS_MODULE, .name = "s3c24xx-simtec-hermes-snd", .pm = simtec_audio_pm, }, diff --git a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c index 83f6c7d49cd6..b4ed2fc1a65c 100644 --- a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c +++ b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c @@ -87,7 +87,6 @@ static int simtec_audio_tlv320aic23_probe(struct platform_device *pd) static struct platform_driver simtec_audio_tlv320aic23_driver = { .driver = { - .owner = THIS_MODULE, .name = "s3c24xx-simtec-tlv320aic23", .pm = simtec_audio_pm, }, diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c index 1b7b52b0af97..9c6f7db56f60 100644 --- a/sound/soc/samsung/s3c24xx_uda134x.c +++ b/sound/soc/samsung/s3c24xx_uda134x.c @@ -340,7 +340,6 @@ static struct platform_driver s3c24xx_uda134x_driver = { .remove = s3c24xx_uda134x_remove, .driver = { .name = "s3c24xx_uda134x", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/samsung/smdk_wm8580pcm.c b/sound/soc/samsung/smdk_wm8580pcm.c index 63d079303561..05c609c62de9 100644 --- a/sound/soc/samsung/smdk_wm8580pcm.c +++ b/sound/soc/samsung/smdk_wm8580pcm.c @@ -173,7 +173,6 @@ static int snd_smdk_probe(struct platform_device *pdev) static struct platform_driver snd_smdk_driver = { .driver = { - .owner = THIS_MODULE, .name = "samsung-smdk-pcm", }, .probe = snd_smdk_probe, diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index 3d6272a8cad2..d38595fbdab7 100644 --- a/sound/soc/samsung/smdk_wm8994.c +++ b/sound/soc/samsung/smdk_wm8994.c @@ -191,7 +191,6 @@ static int smdk_audio_probe(struct platform_device *pdev) static struct platform_driver smdk_audio_driver = { .driver = { .name = "smdk-audio-wm8994", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(samsung_wm8994_of_match), .pm = &snd_soc_pm_ops, }, diff --git a/sound/soc/samsung/smdk_wm8994pcm.c b/sound/soc/samsung/smdk_wm8994pcm.c index b6c09979be1f..c470e8eed6e1 100644 --- a/sound/soc/samsung/smdk_wm8994pcm.c +++ b/sound/soc/samsung/smdk_wm8994pcm.c @@ -143,7 +143,6 @@ static int snd_smdk_probe(struct platform_device *pdev) static struct platform_driver snd_smdk_driver = { .driver = { - .owner = THIS_MODULE, .name = "samsung-smdk-pcm", }, .probe = snd_smdk_probe, diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c index 72118a77dd5b..7651dc924161 100644 --- a/sound/soc/samsung/snow.c +++ b/sound/soc/samsung/snow.c @@ -115,7 +115,6 @@ MODULE_DEVICE_TABLE(of, snow_of_match); static struct platform_driver snow_driver = { .driver = { .name = "snow-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = snow_of_match, }, diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index d7d2e208f486..36dbc0e96004 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c @@ -477,7 +477,6 @@ static struct platform_driver samsung_spdif_driver = { .remove = spdif_remove, .driver = { .name = "samsung-spdif", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index a05482651aae..5ec7c52282f2 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c @@ -340,7 +340,6 @@ static int speyside_probe(struct platform_device *pdev) static struct platform_driver speyside_driver = { .driver = { .name = "speyside", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = speyside_probe, diff --git a/sound/soc/samsung/tobermory.c b/sound/soc/samsung/tobermory.c index 6a2b9f14d624..9c80506527c4 100644 --- a/sound/soc/samsung/tobermory.c +++ b/sound/soc/samsung/tobermory.c @@ -234,7 +234,6 @@ static int tobermory_probe(struct platform_device *pdev) static struct platform_driver tobermory_driver = { .driver = { .name = "tobermory", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = tobermory_probe, diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c index c85f8eb66c97..a5b2c4ea90d9 100644 --- a/sound/soc/sh/dma-sh7760.c +++ b/sound/soc/sh/dma-sh7760.c @@ -345,7 +345,6 @@ static int sh7760_soc_platform_remove(struct platform_device *pdev) static struct platform_driver sh7760_pcm_driver = { .driver = { .name = "sh7760-pcm-audio", - .owner = THIS_MODULE, }, .probe = sh7760_soc_platform_probe, diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index d5f567e085ff..84c51037a7d0 100644 --- a/sound/soc/sh/hac.c +++ b/sound/soc/sh/hac.c @@ -333,7 +333,6 @@ static int hac_soc_platform_remove(struct platform_device *pdev) static struct platform_driver hac_pcm_driver = { .driver = { .name = "hac-pcm-audio", - .owner = THIS_MODULE, }, .probe = hac_soc_platform_probe, diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c index d55babee14f8..abb0d956231c 100644 --- a/sound/soc/sh/siu_dai.c +++ b/sound/soc/sh/siu_dai.c @@ -845,7 +845,6 @@ static int siu_remove(struct platform_device *pdev) static struct platform_driver siu_driver = { .driver = { - .owner = THIS_MODULE, .name = "siu-pcm-audio", }, .probe = siu_probe, diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c index e889405ebd38..ab13146e4f82 100644 --- a/sound/soc/sh/ssi.c +++ b/sound/soc/sh/ssi.c @@ -398,7 +398,6 @@ static int sh4_soc_dai_remove(struct platform_device *pdev) static struct platform_driver sh4_ssi_driver = { .driver = { .name = "sh4-ssi-dai", - .owner = THIS_MODULE, }, .probe = sh4_soc_dai_probe, diff --git a/sound/soc/sirf/sirf-audio-port.c b/sound/soc/sirf/sirf-audio-port.c index b4afa31b2bc1..3f2cce03275c 100644 --- a/sound/soc/sirf/sirf-audio-port.c +++ b/sound/soc/sirf/sirf-audio-port.c @@ -74,7 +74,6 @@ MODULE_DEVICE_TABLE(of, sirf_audio_port_of_match); static struct platform_driver sirf_audio_port_driver = { .driver = { .name = "sirf-audio-port", - .owner = THIS_MODULE, .of_match_table = sirf_audio_port_of_match, }, .probe = sirf_audio_port_probe, diff --git a/sound/soc/sirf/sirf-audio.c b/sound/soc/sirf/sirf-audio.c index ecef51021653..94ea152e0362 100644 --- a/sound/soc/sirf/sirf-audio.c +++ b/sound/soc/sirf/sirf-audio.c @@ -143,7 +143,6 @@ MODULE_DEVICE_TABLE(of, sirf_audio_of_match); static struct platform_driver sirf_audio_driver = { .driver = { .name = "sirf-audio-card", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = sirf_audio_of_match, }, diff --git a/sound/soc/sirf/sirf-usp.c b/sound/soc/sirf/sirf-usp.c index 186dc7f33a55..45fc06c0e0e5 100644 --- a/sound/soc/sirf/sirf-usp.c +++ b/sound/soc/sirf/sirf-usp.c @@ -422,7 +422,6 @@ static const struct dev_pm_ops sirf_usp_pcm_pm_ops = { static struct platform_driver sirf_usp_pcm_driver = { .driver = { .name = "sirf-usp-pcm", - .owner = THIS_MODULE, .of_match_table = sirf_usp_pcm_of_match, .pm = &sirf_usp_pcm_pm_ops, }, diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 935721062c21..985052b3fbed 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1772,7 +1772,6 @@ EXPORT_SYMBOL_GPL(snd_soc_pm_ops); static struct platform_driver soc_driver = { .driver = { .name = "soc-audio", - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, }, .probe = soc_probe, diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index 7f22ca35a413..362c69ac1d6c 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -154,7 +154,6 @@ static int snd_soc_dummy_remove(struct platform_device *pdev) static struct platform_driver soc_dummy_driver = { .driver = { .name = "snd-soc-dummy", - .owner = THIS_MODULE, }, .probe = snd_soc_dummy_probe, .remove = snd_soc_dummy_remove, diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c index 4ab442a63d7e..a4028601da01 100644 --- a/sound/soc/spear/spdif_in.c +++ b/sound/soc/spear/spdif_in.c @@ -274,7 +274,6 @@ static struct platform_driver spdif_in_driver = { .probe = spdif_in_probe, .driver = { .name = "spdif-in", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c index 19cca043e6e4..0a72d52d533e 100644 --- a/sound/soc/spear/spdif_out.c +++ b/sound/soc/spear/spdif_out.c @@ -354,7 +354,6 @@ static struct platform_driver spdif_out_driver = { .probe = spdif_out_probe, .driver = { .name = "spdif-out", - .owner = THIS_MODULE, .pm = SPDIF_OUT_DEV_PM_OPS, }, }; diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index 29a9957d335a..a68368edab9c 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -438,7 +438,6 @@ static const struct of_device_id tegra20_ac97_of_match[] = { static struct platform_driver tegra20_ac97_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = tegra20_ac97_of_match, }, .probe = tegra20_ac97_platform_probe, diff --git a/sound/soc/tegra/tegra20_das.c b/sound/soc/tegra/tegra20_das.c index a634f13b3ffc..f52600b4f3fd 100644 --- a/sound/soc/tegra/tegra20_das.c +++ b/sound/soc/tegra/tegra20_das.c @@ -233,7 +233,6 @@ static struct platform_driver tegra20_das_driver = { .remove = tegra20_das_remove, .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = tegra20_das_of_match, }, }; diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c index 79a9932ffe6e..05f1c6ee99e3 100644 --- a/sound/soc/tegra/tegra20_i2s.c +++ b/sound/soc/tegra/tegra20_i2s.c @@ -464,7 +464,6 @@ static const struct dev_pm_ops tegra20_i2s_pm_ops = { static struct platform_driver tegra20_i2s_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = tegra20_i2s_of_match, .pm = &tegra20_i2s_pm_ops, }, diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c index a0ce92400faf..9141477a528d 100644 --- a/sound/soc/tegra/tegra20_spdif.c +++ b/sound/soc/tegra/tegra20_spdif.c @@ -387,7 +387,6 @@ static const struct dev_pm_ops tegra20_spdif_pm_ops = { static struct platform_driver tegra20_spdif_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .pm = &tegra20_spdif_pm_ops, }, .probe = tegra20_spdif_platform_probe, diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c index 0db68f49f4d9..bc94e5d8e79a 100644 --- a/sound/soc/tegra/tegra30_ahub.c +++ b/sound/soc/tegra/tegra30_ahub.c @@ -723,7 +723,6 @@ static struct platform_driver tegra30_ahub_driver = { .remove = tegra30_ahub_remove, .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = tegra30_ahub_of_match, .pm = &tegra30_ahub_pm_ops, }, diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index f146c41dd3ec..fe36375ba89c 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -585,7 +585,6 @@ static const struct dev_pm_ops tegra30_i2s_pm_ops = { static struct platform_driver tegra30_i2s_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = tegra30_i2s_of_match, .pm = &tegra30_i2s_pm_ops, }, diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index a83aff09dce2..769aca2fc5f5 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -250,7 +250,6 @@ static const struct of_device_id tegra_alc5632_of_match[] = { static struct platform_driver tegra_alc5632_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = tegra_alc5632_of_match, }, diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c index 01921d7e73fa..af3fb997b752 100644 --- a/sound/soc/tegra/tegra_max98090.c +++ b/sound/soc/tegra/tegra_max98090.c @@ -308,7 +308,6 @@ static const struct of_device_id tegra_max98090_of_match[] = { static struct platform_driver tegra_max98090_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = tegra_max98090_of_match, }, diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index 4ebe3871e610..ed759a3076b8 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -255,7 +255,6 @@ static const struct of_device_id tegra_rt5640_of_match[] = { static struct platform_driver tegra_rt5640_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = tegra_rt5640_of_match, }, diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c index 769e28f6642e..f0cd01dbfc38 100644 --- a/sound/soc/tegra/tegra_wm8753.c +++ b/sound/soc/tegra/tegra_wm8753.c @@ -204,7 +204,6 @@ static const struct of_device_id tegra_wm8753_of_match[] = { static struct platform_driver tegra_wm8753_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = tegra_wm8753_of_match, }, diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index 86e05e938585..e52420dae2b4 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -386,7 +386,6 @@ static const struct of_device_id tegra_wm8903_of_match[] = { static struct platform_driver tegra_wm8903_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = tegra_wm8903_of_match, }, diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c index de087ee3458a..2868b4839bc0 100644 --- a/sound/soc/tegra/tegra_wm9712.c +++ b/sound/soc/tegra/tegra_wm9712.c @@ -167,7 +167,6 @@ static const struct of_device_id tegra_wm9712_of_match[] = { static struct platform_driver tegra_wm9712_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, .of_match_table = tegra_wm9712_of_match, }, diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c index 589d2d9b553a..2cea203c4f5f 100644 --- a/sound/soc/tegra/trimslice.c +++ b/sound/soc/tegra/trimslice.c @@ -193,7 +193,6 @@ MODULE_DEVICE_TABLE(of, trimslice_of_match); static struct platform_driver tegra_snd_trimslice_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .of_match_table = trimslice_of_match, }, .probe = tegra_snd_trimslice_probe, diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index f7135cdaa2ca..e2ad00e3cae1 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c @@ -224,7 +224,6 @@ static struct platform_driver txx9aclc_ac97_driver = { .remove = txx9aclc_ac97_dev_remove, .driver = { .name = "txx9aclc-ac97", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/txx9/txx9aclc-generic.c b/sound/soc/txx9/txx9aclc-generic.c index b056a1431ed4..d0b1e7759968 100644 --- a/sound/soc/txx9/txx9aclc-generic.c +++ b/sound/soc/txx9/txx9aclc-generic.c @@ -66,7 +66,6 @@ static struct platform_driver txx9aclc_generic_driver = { .remove = __exit_p(txx9aclc_generic_remove), .driver = { .name = "txx9aclc-generic", - .owner = THIS_MODULE, }, }; diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c index 00b7e2d02690..070e44e251ce 100644 --- a/sound/soc/txx9/txx9aclc.c +++ b/sound/soc/txx9/txx9aclc.c @@ -429,7 +429,6 @@ static int txx9aclc_soc_platform_remove(struct platform_device *pdev) static struct platform_driver txx9aclc_pcm_driver = { .driver = { .name = "txx9aclc-pcm-audio", - .owner = THIS_MODULE, }, .probe = txx9aclc_soc_platform_probe, diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c index 9f2d045ee118..4e0c0e502ade 100644 --- a/sound/soc/ux500/mop500.c +++ b/sound/soc/ux500/mop500.c @@ -155,7 +155,6 @@ static const struct of_device_id snd_soc_mop500_match[] = { static struct platform_driver snd_soc_mop500_driver = { .driver = { - .owner = THIS_MODULE, .name = "snd-soc-mop500", .of_match_table = snd_soc_mop500_match, }, diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 5f4807b2c007..978f2d7316b0 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -856,7 +856,6 @@ static const struct of_device_id ux500_msp_i2s_match[] = { static struct platform_driver msp_i2s_driver = { .driver = { .name = "ux500-msp-i2s", - .owner = THIS_MODULE, .of_match_table = ux500_msp_i2s_match, }, .probe = ux500_msp_drv_probe, diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index 4a85e1433472..86280d63b76d 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c @@ -1067,7 +1067,6 @@ static const struct of_device_id amd7930_match[] = { static struct platform_driver amd7930_sbus_driver = { .driver = { .name = "audio", - .owner = THIS_MODULE, .of_match_table = amd7930_match, }, .probe = amd7930_sbus_probe, diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 06606f9bbf78..30bdc971883b 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c @@ -2111,7 +2111,6 @@ MODULE_DEVICE_TABLE(of, cs4231_match); static struct platform_driver cs4231_driver = { .driver = { .name = "audio", - .owner = THIS_MODULE, .of_match_table = cs4231_match, }, .probe = cs4231_probe, diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index b2c3d0d5dca3..0190cb6332f2 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c @@ -2686,7 +2686,6 @@ MODULE_DEVICE_TABLE(of, dbri_match); static struct platform_driver dbri_sbus_driver = { .driver = { .name = "dbri", - .owner = THIS_MODULE, .of_match_table = dbri_match, }, .probe = dbri_probe, diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 73d2ba47cc31..0a598af9b38b 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2753,133 +2753,45 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, -/* Hauppauge HVR-950Q and HVR-850 */ -{ - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7200), - .match_flags = USB_DEVICE_ID_MATCH_DEVICE | - USB_DEVICE_ID_MATCH_INT_CLASS | - USB_DEVICE_ID_MATCH_INT_SUBCLASS, - .bInterfaceClass = USB_CLASS_AUDIO, - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { - .vendor_name = "Hauppauge", - .product_name = "HVR-950Q", - .ifnum = QUIRK_ANY_INTERFACE, - .type = QUIRK_AUDIO_ALIGN_TRANSFER, - } -}, -{ - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7210), - .match_flags = USB_DEVICE_ID_MATCH_DEVICE | - USB_DEVICE_ID_MATCH_INT_CLASS | - USB_DEVICE_ID_MATCH_INT_SUBCLASS, - .bInterfaceClass = USB_CLASS_AUDIO, - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { - .vendor_name = "Hauppauge", - .product_name = "HVR-950Q", - .ifnum = QUIRK_ANY_INTERFACE, - .type = QUIRK_AUDIO_ALIGN_TRANSFER, - } -}, -{ - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7217), - .match_flags = USB_DEVICE_ID_MATCH_DEVICE | - USB_DEVICE_ID_MATCH_INT_CLASS | - USB_DEVICE_ID_MATCH_INT_SUBCLASS, - .bInterfaceClass = USB_CLASS_AUDIO, - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { - .vendor_name = "Hauppauge", - .product_name = "HVR-950Q", - .ifnum = QUIRK_ANY_INTERFACE, - .type = QUIRK_AUDIO_ALIGN_TRANSFER, - } -}, -{ - USB_DEVICE_VENDOR_SPEC(0x2040, 0x721b), - .match_flags = USB_DEVICE_ID_MATCH_DEVICE | - USB_DEVICE_ID_MATCH_INT_CLASS | - USB_DEVICE_ID_MATCH_INT_SUBCLASS, - .bInterfaceClass = USB_CLASS_AUDIO, - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { - .vendor_name = "Hauppauge", - .product_name = "HVR-950Q", - .ifnum = QUIRK_ANY_INTERFACE, - .type = QUIRK_AUDIO_ALIGN_TRANSFER, - } -}, -{ - USB_DEVICE_VENDOR_SPEC(0x2040, 0x721e), - .match_flags = USB_DEVICE_ID_MATCH_DEVICE | - USB_DEVICE_ID_MATCH_INT_CLASS | - USB_DEVICE_ID_MATCH_INT_SUBCLASS, - .bInterfaceClass = USB_CLASS_AUDIO, - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { - .vendor_name = "Hauppauge", - .product_name = "HVR-950Q", - .ifnum = QUIRK_ANY_INTERFACE, - .type = QUIRK_AUDIO_ALIGN_TRANSFER, - } -}, -{ - USB_DEVICE_VENDOR_SPEC(0x2040, 0x721f), - .match_flags = USB_DEVICE_ID_MATCH_DEVICE | - USB_DEVICE_ID_MATCH_INT_CLASS | - USB_DEVICE_ID_MATCH_INT_SUBCLASS, - .bInterfaceClass = USB_CLASS_AUDIO, - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { - .vendor_name = "Hauppauge", - .product_name = "HVR-950Q", - .ifnum = QUIRK_ANY_INTERFACE, - .type = QUIRK_AUDIO_ALIGN_TRANSFER, - } -}, -{ - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7240), - .match_flags = USB_DEVICE_ID_MATCH_DEVICE | - USB_DEVICE_ID_MATCH_INT_CLASS | - USB_DEVICE_ID_MATCH_INT_SUBCLASS, - .bInterfaceClass = USB_CLASS_AUDIO, - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { - .vendor_name = "Hauppauge", - .product_name = "HVR-850", - .ifnum = QUIRK_ANY_INTERFACE, - .type = QUIRK_AUDIO_ALIGN_TRANSFER, - } -}, -{ - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7280), - .match_flags = USB_DEVICE_ID_MATCH_DEVICE | - USB_DEVICE_ID_MATCH_INT_CLASS | - USB_DEVICE_ID_MATCH_INT_SUBCLASS, - .bInterfaceClass = USB_CLASS_AUDIO, - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { - .vendor_name = "Hauppauge", - .product_name = "HVR-950Q", - .ifnum = QUIRK_ANY_INTERFACE, - .type = QUIRK_AUDIO_ALIGN_TRANSFER, - } -}, -{ - USB_DEVICE_VENDOR_SPEC(0x0fd9, 0x0008), - .match_flags = USB_DEVICE_ID_MATCH_DEVICE | - USB_DEVICE_ID_MATCH_INT_CLASS | - USB_DEVICE_ID_MATCH_INT_SUBCLASS, - .bInterfaceClass = USB_CLASS_AUDIO, - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { - .vendor_name = "Hauppauge", - .product_name = "HVR-950Q", - .ifnum = QUIRK_ANY_INTERFACE, - .type = QUIRK_AUDIO_ALIGN_TRANSFER, - } -}, +/* + * Auvitek au0828 devices with audio interface. + * This should be kept in sync with drivers/media/usb/au0828/au0828-cards.c + * Please notice that some drivers are DVB only, and don't need to be + * here. That's the case, for example, of DVICO_FUSIONHDTV7. + */ + +#define AU0828_DEVICE(vid, pid, vname, pname) { \ + USB_DEVICE_VENDOR_SPEC(vid, pid), \ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \ + USB_DEVICE_ID_MATCH_INT_CLASS | \ + USB_DEVICE_ID_MATCH_INT_SUBCLASS, \ + .bInterfaceClass = USB_CLASS_AUDIO, \ + .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, \ + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { \ + .vendor_name = vname, \ + .product_name = pname, \ + .ifnum = QUIRK_ANY_INTERFACE, \ + .type = QUIRK_AUDIO_ALIGN_TRANSFER, \ + } \ +} + +AU0828_DEVICE(0x2040, 0x7200, "Hauppauge", "HVR-950Q"), +AU0828_DEVICE(0x2040, 0x7240, "Hauppauge", "HVR-850"), +AU0828_DEVICE(0x2040, 0x7210, "Hauppauge", "HVR-950Q"), +AU0828_DEVICE(0x2040, 0x7217, "Hauppauge", "HVR-950Q"), +AU0828_DEVICE(0x2040, 0x721b, "Hauppauge", "HVR-950Q"), +AU0828_DEVICE(0x2040, 0x721e, "Hauppauge", "HVR-950Q"), +AU0828_DEVICE(0x2040, 0x721f, "Hauppauge", "HVR-950Q"), +AU0828_DEVICE(0x2040, 0x7280, "Hauppauge", "HVR-950Q"), +AU0828_DEVICE(0x0fd9, 0x0008, "Hauppauge", "HVR-950Q"), +AU0828_DEVICE(0x2040, 0x7201, "Hauppauge", "HVR-950Q-MXL"), +AU0828_DEVICE(0x2040, 0x7211, "Hauppauge", "HVR-950Q-MXL"), +AU0828_DEVICE(0x2040, 0x7281, "Hauppauge", "HVR-950Q-MXL"), +AU0828_DEVICE(0x05e1, 0x0480, "Hauppauge", "Woodbury"), +AU0828_DEVICE(0x2040, 0x8200, "Hauppauge", "Woodbury"), +AU0828_DEVICE(0x2040, 0x7260, "Hauppauge", "HVR-950Q"), +AU0828_DEVICE(0x2040, 0x7213, "Hauppauge", "HVR-950Q"), +AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), /* Digidesign Mbox */ { |
