|
@@ -40,7 +40,6 @@ struct max98088_cdata {
|
|
};
|
|
};
|
|
|
|
|
|
struct max98088_priv {
|
|
struct max98088_priv {
|
|
- u8 reg_cache[M98088_REG_CNT];
|
|
|
|
enum max98088_type devtype;
|
|
enum max98088_type devtype;
|
|
void *control_data;
|
|
void *control_data;
|
|
struct max98088_pdata *pdata;
|
|
struct max98088_pdata *pdata;
|
|
@@ -1588,7 +1587,7 @@ static int max98088_dai2_set_fmt(struct snd_soc_dai *codec_dai,
|
|
|
|
|
|
static void max98088_sync_cache(struct snd_soc_codec *codec)
|
|
static void max98088_sync_cache(struct snd_soc_codec *codec)
|
|
{
|
|
{
|
|
- struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
|
|
|
|
|
|
+ u16 *reg_cache = codec->reg_cache;
|
|
int i;
|
|
int i;
|
|
|
|
|
|
if (!codec->cache_sync)
|
|
if (!codec->cache_sync)
|
|
@@ -1599,14 +1598,14 @@ static void max98088_sync_cache(struct snd_soc_codec *codec)
|
|
/* write back cached values if they're writeable and
|
|
/* write back cached values if they're writeable and
|
|
* different from the hardware default.
|
|
* different from the hardware default.
|
|
*/
|
|
*/
|
|
- for (i = 1; i < ARRAY_SIZE(max98088->reg_cache); i++) {
|
|
|
|
|
|
+ for (i = 1; i < codec->driver->reg_cache_size; i++) {
|
|
if (!max98088_access[i].writable)
|
|
if (!max98088_access[i].writable)
|
|
continue;
|
|
continue;
|
|
|
|
|
|
- if (max98088->reg_cache[i] == max98088_reg[i])
|
|
|
|
|
|
+ if (reg_cache[i] == max98088_reg[i])
|
|
continue;
|
|
continue;
|
|
|
|
|
|
- snd_soc_write(codec, i, max98088->reg_cache[i]);
|
|
|
|
|
|
+ snd_soc_write(codec, i, reg_cache[i]);
|
|
}
|
|
}
|
|
|
|
|
|
codec->cache_sync = 0;
|
|
codec->cache_sync = 0;
|
|
@@ -1951,7 +1950,6 @@ static int max98088_probe(struct snd_soc_codec *codec)
|
|
int ret = 0;
|
|
int ret = 0;
|
|
|
|
|
|
codec->cache_sync = 1;
|
|
codec->cache_sync = 1;
|
|
- memcpy(codec->reg_cache, max98088_reg, sizeof(max98088_reg));
|
|
|
|
|
|
|
|
ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_I2C);
|
|
ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_I2C);
|
|
if (ret != 0) {
|
|
if (ret != 0) {
|