diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 18:19:44 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 18:19:44 +0200 |
commit | e7990d45bb88c2f0565b5ee4c32eefe81653faff (patch) | |
tree | 852ab6988b7226083fefa0e0e851dbff0e7ec7f2 /sound/oss/dmasound/dmasound_paula.c | |
parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/l... (diff) | |
parent | ALSA: usb-audio: Suppress repetitive debug messages from retire_playback_urb() (diff) | |
download | linux-e7990d45bb88c2f0565b5ee4c32eefe81653faff.tar.xz linux-e7990d45bb88c2f0565b5ee4c32eefe81653faff.zip |
Merge tag 'sound-fix-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Here is a bunch of small fixes that have been collected since the
previous pull request. In addition to various misc fixes, the
following are included:
- HD-audio quirks for Dell, HP, Chromebook, and ALC28x codecs
- HD-audio AMD HDMI regression fix
- Continued PM support/fixes for ice1712 driver
- Multiplatform fixes for ASoC samsung drivers
- Addition of device id tables to a few ASoC drivers
- Bit clock polarity config and error flag fixes in ASoC fsl_sai"
* tag 'sound-fix-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (32 commits)
ALSA: usb-audio: Suppress repetitive debug messages from retire_playback_urb()
ALSA: hda - Make full_reset boolean
ALSA: hda - add headset mic detect quirk for a Dell laptop
sound: dmasound: use module_platform_driver_probe()
ALSA: au1x00: use module_platform_driver()
ALSA: hda - Use runtime helper to check active state.
ALSA: ice1712: Fix boundary checks in PCM pointer ops
ASoC: davinci-mcasp: Fix bit clock polarity settings
ASoC: samsung: Fix build on multiplatform
ASoC: fsl_sai: Fix Bit Clock Polarity configurations
ALSA: hda - Do not assign streams in reverse order
ALSA: hda/realtek - Add eapd shutup to ALC283
ALSA: hda/realtek - Change model name alias for ChromeOS
ASoC: da732x: Print correct major id
ALSA: hda/realtek - Improve HP depop when system change power state on Chromebook
ASoC: cs42l52: Fix mask for REVID
sound/oss: Remove uncompilable DBG macro use
ALSA: ice1712: Save/restore routing and rate registers
ALSA: ice1712: restore AK4xxx volumes on resume
ASoC: alc56(23|32): fix undefined return value of probing code
...
Diffstat (limited to 'sound/oss/dmasound/dmasound_paula.c')
-rw-r--r-- | sound/oss/dmasound/dmasound_paula.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c index 87910e992133..c2d45a5848bc 100644 --- a/sound/oss/dmasound/dmasound_paula.c +++ b/sound/oss/dmasound/dmasound_paula.c @@ -733,19 +733,7 @@ static struct platform_driver amiga_audio_driver = { }, }; -static int __init amiga_audio_init(void) -{ - return platform_driver_probe(&amiga_audio_driver, amiga_audio_probe); -} - -module_init(amiga_audio_init); - -static void __exit amiga_audio_exit(void) -{ - platform_driver_unregister(&amiga_audio_driver); -} - -module_exit(amiga_audio_exit); +module_platform_driver_probe(amiga_audio_driver, amiga_audio_probe); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:amiga-audio"); |