diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-11-02 09:00:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-11-02 09:00:37 +0100 |
| commit | bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5 (patch) | |
| tree | 1731a322d153ee18017822a8fd66295a0ec7a4e2 /sound/soc/pxa/brownstone.c | |
| parent | ALSA: hda - Disable 64bit address for Creative HDA controllers (diff) | |
| parent | ALSA: maestro3: Fix Allegro mute until master volume/mute is touched (diff) | |
| download | linux-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.tar.xz linux-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.zip | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/pxa/brownstone.c')
| -rw-r--r-- | sound/soc/pxa/brownstone.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c index 2b26318bc200..6147e86e9b0f 100644 --- a/sound/soc/pxa/brownstone.c +++ b/sound/soc/pxa/brownstone.c @@ -116,26 +116,19 @@ static int brownstone_probe(struct platform_device *pdev) int ret; brownstone.dev = &pdev->dev; - ret = snd_soc_register_card(&brownstone); + ret = devm_snd_soc_register_card(&pdev->dev, &brownstone); if (ret) dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); return ret; } -static int brownstone_remove(struct platform_device *pdev) -{ - snd_soc_unregister_card(&brownstone); - return 0; -} - static struct platform_driver mmp_driver = { .driver = { .name = "brownstone-audio", .pm = &snd_soc_pm_ops, }, .probe = brownstone_probe, - .remove = brownstone_remove, }; module_platform_driver(mmp_driver); |