Title: [9213] trunk/sound/soc/codecs/ssm2604.c: asoc: ssm2604: update api for 2.6.35
- Revision
- 9213
- Author
- vapier
- Date
- 2010-10-16 05:19:33 -0400 (Sat, 16 Oct 2010)
Log Message
asoc: ssm2604: update api for 2.6.35
Modified Paths
Diff
Modified: trunk/sound/soc/codecs/ssm2604.c (9212 => 9213)
--- trunk/sound/soc/codecs/ssm2604.c 2010-10-16 09:01:51 UTC (rev 9212)
+++ trunk/sound/soc/codecs/ssm2604.c 2010-10-16 09:19:33 UTC (rev 9213)
@@ -177,7 +177,7 @@
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->card->codec;
- struct ssm2604_priv *ssm2604 = codec->private_data;
+ struct ssm2604_priv *ssm2604 = snd_soc_codec_get_drvdata(codec);
struct i2c_client *i2c = codec->control_data;
u16 iface = snd_soc_read(codec, SSM2604_IFACE) & 0xfff3;
int i = get_coeff(ssm2604->sysclk, params_rate(params));
@@ -222,7 +222,7 @@
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->card->codec;
- struct ssm2604_priv *ssm2604 = codec->private_data;
+ struct ssm2604_priv *ssm2604 = snd_soc_codec_get_drvdata(codec);
struct i2c_client *i2c = codec->control_data;
struct snd_pcm_runtime *master_runtime;
@@ -273,7 +273,7 @@
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_codec *codec = socdev->card->codec;
- struct ssm2604_priv *ssm2604 = codec->private_data;
+ struct ssm2604_priv *ssm2604 = snd_soc_codec_get_drvdata(codec);
/* deactivate */
if (!codec->active)
@@ -301,7 +301,7 @@
int clk_id, unsigned int freq, int dir)
{
struct snd_soc_codec *codec = codec_dai->codec;
- struct ssm2604_priv *ssm2604 = codec->private_data;
+ struct ssm2604_priv *ssm2604 = snd_soc_codec_get_drvdata(codec);
switch (freq) {
case 11289600:
case 12000000:
@@ -439,7 +439,7 @@
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->card->codec;
- struct ssm2604_priv *ssm2604 = codec->private_data;
+ struct ssm2604_priv *ssm2604 = snd_soc_codec_get_drvdata(codec);
ssm2604->pwr_state = snd_soc_read(codec, SSM2604_PWR);
ssm2604_set_bias_level(codec, SND_SOC_BIAS_OFF);
@@ -450,7 +450,7 @@
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->card->codec;
- struct ssm2604_priv *ssm2604 = codec->private_data;
+ struct ssm2604_priv *ssm2604 = snd_soc_codec_get_drvdata(codec);
int i;
u8 data[2];
u16 *cache = codec->reg_cache;
@@ -588,7 +588,7 @@
if (ssm2604 == NULL)
return -ENOMEM;
codec = &ssm2604->codec;
- codec->private_data = ssm2604;
+ snd_soc_codec_set_drvdata(codec, ssm2604);
i2c_set_clientdata(i2c, ssm2604);
codec->control_data = i2c;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
