diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-12-10 12:00:45 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-12-10 12:00:45 +0400 |
| commit | 97768a8e658605a905ba0d908d1b23b475170bed (patch) | |
| tree | 0431dd9a118c138d164c263033a53502e4c01586 /sound/soc/fsl/imx-sgtl5000.c | |
| parent | 9621055fbbb190264cb6a8182b70e3f0f917d770 (diff) | |
| parent | 7a79e94e973639da7bf1b8242d504f9db9e5e848 (diff) | |
| download | linux-97768a8e658605a905ba0d908d1b23b475170bed.tar.xz | |
Merge tag 'asoc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.8
Some incremental updates, nothing too exciting. The biggest block here
is the __dev annotation removal stuff from Bill, everything else is the
usual driver-specific stuff - a combination of fixes and development.
There will be at least more more set of fixes to come but I wanted to
get these out ready for the merge window to make sure Bill's stuff makes
it in.
Diffstat (limited to 'sound/soc/fsl/imx-sgtl5000.c')
| -rw-r--r-- | sound/soc/fsl/imx-sgtl5000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index 3d9b1c427ce9..424347e9b2d7 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -56,7 +56,7 @@ static const struct snd_soc_dapm_widget imx_sgtl5000_dapm_widgets[] = { SND_SOC_DAPM_SPK("Ext Spk", NULL), }; -static int __devinit imx_sgtl5000_probe(struct platform_device *pdev) +static int imx_sgtl5000_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; struct device_node *ssi_np, *codec_np; @@ -185,7 +185,7 @@ fail: return ret; } -static int __devexit imx_sgtl5000_remove(struct platform_device *pdev) +static int imx_sgtl5000_remove(struct platform_device *pdev) { struct imx_sgtl5000_data *data = platform_get_drvdata(pdev); @@ -211,7 +211,7 @@ static struct platform_driver imx_sgtl5000_driver = { .of_match_table = imx_sgtl5000_dt_ids, }, .probe = imx_sgtl5000_probe, - .remove = __devexit_p(imx_sgtl5000_remove), + .remove = imx_sgtl5000_remove, }; module_platform_driver(imx_sgtl5000_driver); |