Diff
Modified: trunk/sound/soc/codecs/ad193x.c (9210 => 9211)
--- trunk/sound/soc/codecs/ad193x.c 2010-10-16 07:53:31 UTC (rev 9210)
+++ trunk/sound/soc/codecs/ad193x.c 2010-10-16 08:55:43 UTC (rev 9211)
@@ -257,7 +257,7 @@
int clk_id, unsigned int freq, int dir)
{
struct snd_soc_codec *codec = codec_dai->codec;
- struct ad193x_priv *ad193x = codec->private_data;
+ struct ad193x_priv *ad193x = snd_soc_codec_get_drvdata(codec);
switch (freq) {
case 12288000:
case 18432000:
@@ -278,7 +278,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 ad193x_priv *ad193x = codec->private_data;
+ struct ad193x_priv *ad193x = snd_soc_codec_get_drvdata(codec);
/* bit size */
switch (params_format(params)) {
Modified: trunk/sound/soc/codecs/adau1361.c (9210 => 9211)
--- trunk/sound/soc/codecs/adau1361.c 2010-10-16 07:53:31 UTC (rev 9210)
+++ trunk/sound/soc/codecs/adau1361.c 2010-10-16 08:55:43 UTC (rev 9211)
@@ -137,7 +137,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1361_priv *adau1361 = codec->private_data;
+ struct adau1361_priv *adau1361 = snd_soc_codec_get_drvdata(codec);
if (adau1361->in_source & CAP_MIC)
ucontrol->value.integer.value[0] = 0x0;
@@ -151,7 +151,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1361_priv *adau1361 = codec->private_data;
+ struct adau1361_priv *adau1361 = snd_soc_codec_get_drvdata(codec);
int src = ""
u8 regvalue = 0;
@@ -195,7 +195,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1361_priv *adau1361 = codec->private_data;
+ struct adau1361_priv *adau1361 = snd_soc_codec_get_drvdata(codec);
if (adau1361->in_source & CAP_MIC)
ucontrol->value.integer.value[0] =
@@ -213,7 +213,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1361_priv *adau1361 = codec->private_data;
+ struct adau1361_priv *adau1361 = snd_soc_codec_get_drvdata(codec);
int val = ucontrol->value.integer.value[0];
u8 regvalue = 0;
@@ -430,7 +430,7 @@
static int adau1361_pll_init(struct snd_soc_codec *codec)
{
- struct adau1361_priv *adau1361 = codec->private_data;
+ struct adau1361_priv *adau1361 = snd_soc_codec_get_drvdata(codec);
u8 *pll_reg = adau1361->adau1361_pll_reg;
int ix = 0;
@@ -455,7 +455,7 @@
static int adau1361_pll_enable(struct snd_soc_codec *codec, int enable)
{
- struct adau1361_priv *adau1361 = codec->private_data;
+ struct adau1361_priv *adau1361 = snd_soc_codec_get_drvdata(codec);
u8 *pll_reg = adau1361->adau1361_pll_reg;
int counter = 0;
@@ -542,7 +542,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 adau1361_priv *adau1361 = codec->private_data;
+ struct adau1361_priv *adau1361 = snd_soc_codec_get_drvdata(codec);
int rate = params_rate(params);
int i;
@@ -564,7 +564,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 adau1361_priv *adau1361 = codec->private_data;
+ struct adau1361_priv *adau1361 = snd_soc_codec_get_drvdata(codec);
u8 reg = 0;
int ret = 0;
@@ -642,7 +642,7 @@
int clk_id, unsigned int freq, int dir)
{
struct snd_soc_codec *codec = codec_dai->codec;
- struct adau1361_priv *adau1361 = codec->private_data;
+ struct adau1361_priv *adau1361 = snd_soc_codec_get_drvdata(codec);
switch (freq) {
case 12000000:
@@ -661,7 +661,7 @@
int pll_id, int source, unsigned int freq_in, unsigned int freq_out)
{
struct snd_soc_codec *codec = codec_dai->codec;
- struct adau1361_priv *adau1361 = codec->private_data;
+ struct adau1361_priv *adau1361 = snd_soc_codec_get_drvdata(codec);
/* fixed MCLK only supported for now */
if (adau1361->sysclk != freq_in)
@@ -796,7 +796,7 @@
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->card->codec;
- struct adau1361_priv *adau1361 = codec->private_data;
+ struct adau1361_priv *adau1361 = snd_soc_codec_get_drvdata(codec);
adau1361->pdev = pdev;
schedule_work(&adau1361->resume_work);
@@ -868,7 +868,7 @@
socdev->card->codec = adau1361_codec;
codec = adau1361_codec;
- adau1361 = codec->private_data;
+ adau1361 = snd_soc_codec_get_drvdata(codec);
adau1361->in_source = CAP_MIC; /*default is mic input*/
adau1361->sysclk = ADAU1361_MCLK_RATE;
adau1361->pll_out = ADAU1361_PLL_FREQ_48;
@@ -926,7 +926,7 @@
if (adau1361 == NULL)
return -ENOMEM;
codec = &adau1361->codec;
- codec->private_data = adau1361;
+ snd_soc_codec_set_drvdata(codec, adau1361);
codec->hw_write = (hw_write_t)i2c_master_send;
i2c_set_clientdata(i2c, adau1361);
Modified: trunk/sound/soc/codecs/adau1371.c (9210 => 9211)
--- trunk/sound/soc/codecs/adau1371.c 2010-10-16 07:53:31 UTC (rev 9210)
+++ trunk/sound/soc/codecs/adau1371.c 2010-10-16 08:55:43 UTC (rev 9211)
@@ -48,7 +48,7 @@
{
int i;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1371_priv *chip = codec->private_data;
+ struct adau1371_priv *chip = snd_soc_codec_get_drvdata(codec);
u8 *cache = codec->reg_cache;
for (i = 0; i < CHANNELS_OUTPUT; ++i) {
@@ -71,7 +71,7 @@
{
int i;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1371_priv *chip = codec->private_data;
+ struct adau1371_priv *chip = snd_soc_codec_get_drvdata(codec);
int change = 0;
u8 *cache = codec->reg_cache;
@@ -114,7 +114,7 @@
{
int i;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1371_priv *chip = codec->private_data;
+ struct adau1371_priv *chip = snd_soc_codec_get_drvdata(codec);
u8 *cache = codec->reg_cache;
for (i = 0; i < CHANNELS_INPUT; ++i) {
@@ -140,7 +140,7 @@
{
int i, check, vol;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1371_priv *chip = codec->private_data;
+ struct adau1371_priv *chip = snd_soc_codec_get_drvdata(codec);
int change = 0;
u8 *cache = codec->reg_cache;
@@ -282,7 +282,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1371_priv *chip = codec->private_data;
+ struct adau1371_priv *chip = snd_soc_codec_get_drvdata(codec);
if (chip->in_chan_mask & CAP_INPA)
ucontrol->value.integer.value[0] = 0;
@@ -300,7 +300,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1371_priv *chip = codec->private_data;
+ struct adau1371_priv *chip = snd_soc_codec_get_drvdata(codec);
u8 reg, *cache = codec->reg_cache;
reg = snd_soc_read(codec, ADAU1371_PWRCTLA);
@@ -371,7 +371,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1371_priv *chip = codec->private_data;
+ struct adau1371_priv *chip = snd_soc_codec_get_drvdata(codec);
if (chip->out_chan_mask & PB_LINE)
ucontrol->value.enumerated.item[0] = 0;
@@ -387,7 +387,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1371_priv *chip = codec->private_data;
+ struct adau1371_priv *chip = snd_soc_codec_get_drvdata(codec);
u8 *cache = codec->reg_cache;
u8 reg;
@@ -542,7 +542,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 adau1371_priv *adau1371 = codec->private_data;
+ struct adau1371_priv *adau1371 = snd_soc_codec_get_drvdata(codec);
const struct _pll_settings *pll_settings = adau1371->data->pll_settings;
int i = 0;
u8 dai_ctl;
@@ -679,7 +679,7 @@
unsigned int freq, int dir)
{
struct snd_soc_codec *codec = codec_dai->codec;
- struct adau1371_priv *adau1371 = codec->private_data;
+ struct adau1371_priv *adau1371 = snd_soc_codec_get_drvdata(codec);
adau1371->sysclk = freq;
@@ -959,7 +959,7 @@
socdev->card->codec = adau1371_codec;
codec = adau1371_codec;
- adau1371 = codec->private_data;
+ adau1371 = snd_soc_codec_get_drvdata(codec);
adau1371->data = ""
ret = adau1371_init(adau1371);
@@ -1010,7 +1010,7 @@
if (adau1371 == NULL)
return -ENOMEM;
codec = &adau1371->codec;
- codec->private_data = adau1371;
+ snd_soc_codec_set_drvdata(codec, adau1371);
codec->hw_write = (hw_write_t)i2c_master_send;
i2c_set_clientdata(i2c, adau1371);
Modified: trunk/sound/soc/codecs/adau1373.c (9210 => 9211)
--- trunk/sound/soc/codecs/adau1373.c 2010-10-16 07:53:31 UTC (rev 9210)
+++ trunk/sound/soc/codecs/adau1373.c 2010-10-16 08:55:43 UTC (rev 9211)
@@ -23,8 +23,6 @@
#include "adau1373.h"
-
-
struct snd_soc_codec_device soc_codec_dev_adau1373;
static struct snd_soc_codec *adau1373_codec;
struct adau1373_priv {
@@ -36,7 +34,6 @@
struct snd_soc_codec codec;
};
-
/*
* write a multibyte ADAU1373 register (6byte pll reg)
*/
@@ -74,7 +71,7 @@
{
int i;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1373_priv *chip = codec->private_data;
+ struct adau1373_priv *chip = snd_soc_codec_get_drvdata(codec);
u8 *cache = codec->reg_cache;
for (i = 0; i < CHANNELS_OUTPUT; ++i) {
@@ -105,7 +102,7 @@
{
int i;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1373_priv *chip = codec->private_data;
+ struct adau1373_priv *chip = snd_soc_codec_get_drvdata(codec);
int change = 0;
u8 *cache = codec->reg_cache;
@@ -155,7 +152,7 @@
{
int i;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1373_priv *chip = codec->private_data;
+ struct adau1373_priv *chip = snd_soc_codec_get_drvdata(codec);
u8 *cache = codec->reg_cache;
for (i = 0; i < CHANNELS_INPUT; ++i) {
@@ -181,7 +178,7 @@
{
int i, check, vol;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1373_priv *chip = codec->private_data;
+ struct adau1373_priv *chip = snd_soc_codec_get_drvdata(codec);
int change = 0;
u8 *cache = codec->reg_cache;
@@ -323,7 +320,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1373_priv *chip = codec->private_data;
+ struct adau1373_priv *chip = snd_soc_codec_get_drvdata(codec);
if (chip->in_chan_mask & CAP_INPA)
ucontrol->value.integer.value[0] = 0;
@@ -343,7 +340,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1373_priv *chip = codec->private_data;
+ struct adau1373_priv *chip = snd_soc_codec_get_drvdata(codec);
u8 reg, *cache = codec->reg_cache;
reg = snd_soc_read(codec, ADAU_PWDCTL1);
@@ -422,7 +419,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1373_priv *chip = codec->private_data;
+ struct adau1373_priv *chip = snd_soc_codec_get_drvdata(codec);
if (chip->out_chan_mask & PB_LINE1)
ucontrol->value.enumerated.item[0] = 0;
@@ -442,7 +439,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1373_priv *chip = codec->private_data;
+ struct adau1373_priv *chip = snd_soc_codec_get_drvdata(codec);
u8 *cache = codec->reg_cache;
u8 reg0, reg1;
@@ -619,7 +616,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 adau1373_priv *adau1373 = codec->private_data;
+ struct adau1373_priv *adau1373 = snd_soc_codec_get_drvdata(codec);
u8 *pll_reg = adau1373->adau1373_pll_reg;
const struct _pll_settings *pll_settings = adau1373->data->pll_settings;
int i = 0;
@@ -722,7 +719,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 adau1373_priv *adau1373 = codec->private_data;
+ struct adau1373_priv *adau1373 = snd_soc_codec_get_drvdata(codec);
u8 *pll_reg = adau1373->adau1373_pll_reg;
int counter = 0;
u8 reg;
@@ -791,7 +788,7 @@
unsigned int freq, int dir)
{
struct snd_soc_codec *codec = codec_dai->codec;
- struct adau1373_priv *adau1373 = codec->private_data;
+ struct adau1373_priv *adau1373 = snd_soc_codec_get_drvdata(codec);
adau1373->sysclk = freq;
@@ -1087,7 +1084,7 @@
socdev->card->codec = adau1373_codec;
codec = adau1373_codec;
- adau1373 = codec->private_data;
+ adau1373 = snd_soc_codec_get_drvdata(codec);
adau1373->data = ""
ret = adau1373_init(adau1373);
@@ -1138,7 +1135,7 @@
if (adau1373 == NULL)
return -ENOMEM;
codec = &adau1373->codec;
- codec->private_data = adau1373;
+ snd_soc_codec_set_drvdata(codec, adau1373);
codec->hw_write = (hw_write_t)i2c_master_send;
i2c_set_clientdata(i2c, adau1373);
Modified: trunk/sound/soc/codecs/adau1381.c (9210 => 9211)
--- trunk/sound/soc/codecs/adau1381.c 2010-10-16 07:53:31 UTC (rev 9210)
+++ trunk/sound/soc/codecs/adau1381.c 2010-10-16 08:55:43 UTC (rev 9211)
@@ -263,7 +263,7 @@
static int adau1381_pll_init(struct snd_soc_codec *codec)
{
- struct adau1381_priv *adau1381 = codec->private_data;
+ struct adau1381_priv *adau1381 = snd_soc_codec_get_drvdata(codec);
u8 *pll_reg = adau1381->adau1381_pll_reg;
int ix = 0;
@@ -288,7 +288,7 @@
static int adau1381_pll_enable(struct snd_soc_codec *codec, int enable)
{
- struct adau1381_priv *adau1381 = codec->private_data;
+ struct adau1381_priv *adau1381 = snd_soc_codec_get_drvdata(codec);
u8 *pll_reg = adau1381->adau1381_pll_reg;
int counter = 0;
@@ -387,7 +387,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 adau1381_priv *adau1381 = codec->private_data;
+ struct adau1381_priv *adau1381 = snd_soc_codec_get_drvdata(codec);
int rate = params_rate(params);
int i;
@@ -410,7 +410,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 adau1381_priv *adau1381 = codec->private_data;
+ struct adau1381_priv *adau1381 = snd_soc_codec_get_drvdata(codec);
u8 reg = 0;
int ret = 0;
@@ -496,10 +496,10 @@
* Clock after PLL and dividers
*/
static int adau1381_set_dai_sysclk(struct snd_soc_dai *codec_dai,
- int clk_id, int source, unsigned int freq, int dir)
+ int clk_id, unsigned int freq, int dir)
{
struct snd_soc_codec *codec = codec_dai->codec;
- struct adau1381_priv *adau1381 = codec->private_data;
+ struct adau1381_priv *adau1381 = snd_soc_codec_get_drvdata(codec);
switch (freq) {
case 12000000:
@@ -515,10 +515,10 @@
}
static int adau1381_set_dai_pll(struct snd_soc_dai *codec_dai,
- int pll_id, unsigned int freq_in, unsigned int freq_out)
+ int pll_id, int source, unsigned int freq_in, unsigned int freq_out)
{
struct snd_soc_codec *codec = codec_dai->codec;
- struct adau1381_priv *adau1381 = codec->private_data;
+ struct adau1381_priv *adau1381 = snd_soc_codec_get_drvdata(codec);
/* fixed MCLK only supported for now */
if (adau1381->sysclk != freq_in)
@@ -647,7 +647,7 @@
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->card->codec;
- struct adau1381_priv *adau1381 = codec->private_data;
+ struct adau1381_priv *adau1381 = snd_soc_codec_get_drvdata(codec);
adau1381->pdev = pdev;
schedule_work(&adau1381->resume_work);
@@ -719,7 +719,7 @@
socdev->card->codec = adau1381_codec;
codec = adau1381_codec;
- adau1381 = codec->private_data;
+ adau1381 = snd_soc_codec_get_drvdata(codec);
adau1381->in_source = CAP_MIC; /*default is mic input*/
adau1381->sysclk = ADAU1381_MCLK_RATE;
adau1381->pll_out = ADAU1381_PLL_FREQ_48;
@@ -776,7 +776,7 @@
if (adau1381 == NULL)
return -ENOMEM;
codec = &adau1381->codec;
- codec->private_data = adau1381;
+ snd_soc_codec_set_drvdata(codec, adau1381);
codec->hw_write = (hw_write_t)i2c_master_send;
i2c_set_clientdata(i2c, adau1381);
Modified: trunk/sound/soc/codecs/adau1761.c (9210 => 9211)
--- trunk/sound/soc/codecs/adau1761.c 2010-10-16 07:53:31 UTC (rev 9210)
+++ trunk/sound/soc/codecs/adau1761.c 2010-10-16 08:55:43 UTC (rev 9211)
@@ -139,7 +139,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1761_priv *adau1761 = codec->private_data;
+ struct adau1761_priv *adau1761 = snd_soc_codec_get_drvdata(codec);
if (adau1761->in_source & CAP_MIC)
ucontrol->value.integer.value[0] = 0x0;
@@ -153,7 +153,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1761_priv *adau1761 = codec->private_data;
+ struct adau1761_priv *adau1761 = snd_soc_codec_get_drvdata(codec);
int src = ""
u8 regvalue = 0;
@@ -198,7 +198,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1761_priv *adau1761 = codec->private_data;
+ struct adau1761_priv *adau1761 = snd_soc_codec_get_drvdata(codec);
if (adau1761->in_source & CAP_MIC)
ucontrol->value.integer.value[0] =
@@ -216,7 +216,7 @@
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
- struct adau1761_priv *adau1761 = codec->private_data;
+ struct adau1761_priv *adau1761 = snd_soc_codec_get_drvdata(codec);
int val = ucontrol->value.integer.value[0];
u8 regvalue = 0;
@@ -431,7 +431,7 @@
static int adau1761_pll_init(struct snd_soc_codec *codec)
{
- struct adau1761_priv *adau1761 = codec->private_data;
+ struct adau1761_priv *adau1761 = snd_soc_codec_get_drvdata(codec);
u8 *pll_reg = adau1761->adau1761_pll_reg;
int ix = 0;
/* Clear dsp Run bit */
@@ -458,7 +458,7 @@
static int adau1761_pll_enable(struct snd_soc_codec *codec, int enable)
{
- struct adau1761_priv *adau1761 = codec->private_data;
+ struct adau1761_priv *adau1761 = snd_soc_codec_get_drvdata(codec);
u8 *pll_reg = adau1761->adau1761_pll_reg;
int counter = 0;
@@ -595,7 +595,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 adau1761_priv *adau1761 = codec->private_data;
+ struct adau1761_priv *adau1761 = snd_soc_codec_get_drvdata(codec);
int rate = params_rate(params);
int i;
@@ -618,7 +618,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 adau1761_priv *adau1761 = codec->private_data;
+ struct adau1761_priv *adau1761 = snd_soc_codec_get_drvdata(codec);
u8 reg = 0;
int ret = 0;
@@ -702,7 +702,7 @@
int clk_id, unsigned int freq, int dir)
{
struct snd_soc_codec *codec = codec_dai->codec;
- struct adau1761_priv *adau1761 = codec->private_data;
+ struct adau1761_priv *adau1761 = snd_soc_codec_get_drvdata(codec);
switch (freq) {
case 12000000:
@@ -721,7 +721,7 @@
int pll_id, int source, unsigned int freq_in, unsigned int freq_out)
{
struct snd_soc_codec *codec = codec_dai->codec;
- struct adau1761_priv *adau1761 = codec->private_data;
+ struct adau1761_priv *adau1761 = snd_soc_codec_get_drvdata(codec);
/* fixed MCLK only supported for now */
if (adau1761->sysclk != freq_in)
@@ -861,7 +861,7 @@
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->card->codec;
- struct adau1761_priv *adau1761 = codec->private_data;
+ struct adau1761_priv *adau1761 = snd_soc_codec_get_drvdata(codec);
adau1761->pdev = pdev;
schedule_work(&adau1761->resume_work);
@@ -948,7 +948,7 @@
socdev->card->codec = adau1761_codec;
codec = adau1761_codec;
- adau1761 = codec->private_data;
+ adau1761 = snd_soc_codec_get_drvdata(codec);
adau1761->in_source = CAP_MIC; /*default is mic input*/
adau1761->sysclk = ADAU1761_MCLK_RATE;
adau1761->pll_out = ADAU1761_PLL_FREQ_48;
@@ -1011,7 +1011,7 @@
if (adau1761 == NULL)
return -ENOMEM;
codec = &adau1761->codec;
- codec->private_data = adau1761;
+ snd_soc_codec_set_drvdata(codec, adau1761);
codec->hw_write = (hw_write_t)i2c_master_send;
i2c_set_clientdata(i2c, adau1761);
Modified: trunk/sound/soc/codecs/adav80x.c (9210 => 9211)
--- trunk/sound/soc/codecs/adav80x.c 2010-10-16 07:53:31 UTC (rev 9210)
+++ trunk/sound/soc/codecs/adav80x.c 2010-10-16 08:55:43 UTC (rev 9211)
@@ -196,7 +196,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 adav80x_priv *adav80x = codec->private_data;
+ struct adav80x_priv *adav80x = snd_soc_codec_get_drvdata(codec);
/* bit size */
switch (params_format(params)) {
@@ -264,7 +264,7 @@
int source, unsigned int freq_in, unsigned int freq_out)
{
struct snd_soc_codec *codec = codec_dai->codec;
- struct adav80x_priv *adav80x = codec->private_data;
+ struct adav80x_priv *adav80x = snd_soc_codec_get_drvdata(codec);
int reg = 0;
/* For now, we only enable PLL1 with XIN as source */
@@ -428,7 +428,7 @@
}
mutex_init(&codec->mutex);
- codec->private_data = adav80x;
+ snd_soc_codec_set_drvdata(codec, adav80x);
codec->reg_cache = adav80x->reg_cache;
codec->reg_cache_size = ADAV80X_NUM_REGS;
codec->name = "ADAV80X";
Modified: trunk/sound/soc/codecs/ssm2602.c (9210 => 9211)
--- trunk/sound/soc/codecs/ssm2602.c 2010-10-16 07:53:31 UTC (rev 9210)
+++ trunk/sound/soc/codecs/ssm2602.c 2010-10-16 08:55:43 UTC (rev 9211)
@@ -440,7 +440,7 @@
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->card->codec;
- struct ssm2602_priv *ssm2602 = codec->private_data;
+ struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec);
ssm2602->pwr_state = snd_soc_read(codec, SSM2602_PWR);
ssm2602_set_bias_level(codec, SND_SOC_BIAS_OFF);
@@ -451,7 +451,7 @@
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->card->codec;
- struct ssm2602_priv *ssm2602 = codec->private_data;
+ struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec);
int i;
u8 data[2];
u16 *cache = codec->reg_cache;
@@ -593,7 +593,7 @@
if (ssm2602 == NULL)
return -ENOMEM;
codec = &ssm2602->codec;
- codec->private_data = ssm2602;
+ snd_soc_codec_set_drvdata(codec, ssm2602);
i2c_set_clientdata(i2c, ssm2602);
codec->control_data = i2c;
