|
@@ -40,7 +40,8 @@ static int ac97_prepare(struct snd_pcm_substream *substream)
|
|
}
|
|
}
|
|
|
|
|
|
#define STD_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
|
|
#define STD_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
|
|
- SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
|
|
|
|
|
|
+ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\
|
|
|
|
+ SNDRV_PCM_RATE_48000)
|
|
|
|
|
|
struct snd_soc_codec_dai ac97_dai = {
|
|
struct snd_soc_codec_dai ac97_dai = {
|
|
.name = "AC97 HiFi",
|
|
.name = "AC97 HiFi",
|
|
@@ -86,7 +87,7 @@ static int ac97_soc_probe(struct platform_device *pdev)
|
|
printk(KERN_INFO "AC97 SoC Audio Codec %s\n", AC97_VERSION);
|
|
printk(KERN_INFO "AC97 SoC Audio Codec %s\n", AC97_VERSION);
|
|
|
|
|
|
socdev->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
|
|
socdev->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
|
|
- if (socdev->codec == NULL)
|
|
|
|
|
|
+ if (!socdev->codec)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
codec = socdev->codec;
|
|
codec = socdev->codec;
|
|
mutex_init(&codec->mutex);
|
|
mutex_init(&codec->mutex);
|
|
@@ -102,17 +103,17 @@ static int ac97_soc_probe(struct platform_device *pdev)
|
|
|
|
|
|
/* register pcms */
|
|
/* register pcms */
|
|
ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
|
|
ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
|
|
- if(ret < 0)
|
|
|
|
|
|
+ if (ret < 0)
|
|
goto err;
|
|
goto err;
|
|
|
|
|
|
/* add codec as bus device for standard ac97 */
|
|
/* add codec as bus device for standard ac97 */
|
|
ret = snd_ac97_bus(codec->card, 0, &soc_ac97_ops, NULL, &ac97_bus);
|
|
ret = snd_ac97_bus(codec->card, 0, &soc_ac97_ops, NULL, &ac97_bus);
|
|
- if(ret < 0)
|
|
|
|
|
|
+ if (ret < 0)
|
|
goto bus_err;
|
|
goto bus_err;
|
|
|
|
|
|
memset(&ac97_template, 0, sizeof(struct snd_ac97_template));
|
|
memset(&ac97_template, 0, sizeof(struct snd_ac97_template));
|
|
ret = snd_ac97_mixer(ac97_bus, &ac97_template, &codec->ac97);
|
|
ret = snd_ac97_mixer(ac97_bus, &ac97_template, &codec->ac97);
|
|
- if(ret < 0)
|
|
|
|
|
|
+ if (ret < 0)
|
|
goto bus_err;
|
|
goto bus_err;
|
|
|
|
|
|
ret = snd_soc_register_card(socdev);
|
|
ret = snd_soc_register_card(socdev);
|
|
@@ -135,7 +136,7 @@ static int ac97_soc_remove(struct platform_device *pdev)
|
|
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
|
|
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
|
|
struct snd_soc_codec *codec = socdev->codec;
|
|
struct snd_soc_codec *codec = socdev->codec;
|
|
|
|
|
|
- if(codec == NULL)
|
|
|
|
|
|
+ if (!codec)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
snd_soc_free_pcms(socdev);
|
|
snd_soc_free_pcms(socdev);
|
|
@@ -145,11 +146,10 @@ static int ac97_soc_remove(struct platform_device *pdev)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-struct snd_soc_codec_device soc_codec_dev_ac97= {
|
|
|
|
|
|
+struct snd_soc_codec_device soc_codec_dev_ac97 = {
|
|
.probe = ac97_soc_probe,
|
|
.probe = ac97_soc_probe,
|
|
.remove = ac97_soc_remove,
|
|
.remove = ac97_soc_remove,
|
|
};
|
|
};
|
|
-
|
|
|
|
EXPORT_SYMBOL_GPL(soc_codec_dev_ac97);
|
|
EXPORT_SYMBOL_GPL(soc_codec_dev_ac97);
|
|
|
|
|
|
MODULE_DESCRIPTION("Soc Generic AC97 driver");
|
|
MODULE_DESCRIPTION("Soc Generic AC97 driver");
|