diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2010-12-28 15:37:55 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-28 18:37:21 -0500 |
commit | 839d271c509b6ce5c1da8a8e89fad73a1af0ddda (patch) | |
tree | 0e319023c344782d30c4d1a806a0a94b90e25be0 | |
parent | 6dc47e97a064c4fc0e324fc4accc90415c1509b2 (diff) |
ASoC: codecs: Remove unused reg_cache fields from device structs
The multi-component patch(commit f0fba2ad1) moved the allocation of the
register cache from the driver to the ASoC core. Most drivers where adjusted to
this, but there are quite a few drivers left which now have an unused reg_cache field in
their private device struct.
This patch removes these unused fields.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/ad193x.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/ak4671.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/cs4270.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/cs42l51.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/cx20442.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/tlv320aic26.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/uda1380.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8580.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8711.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8731.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8750.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8900.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8903.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm8940.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8960.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8961.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8974.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8978.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8988.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8993.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm9081.c | 1 |
22 files changed, 1 insertions, 25 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 3e798a12ee3d..5da8207a6961 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c | |||
@@ -146,7 +146,6 @@ struct pm860x_priv { | |||
146 | 146 | ||
147 | int irq[4]; | 147 | int irq[4]; |
148 | unsigned char name[4][MAX_NAME_LEN]; | 148 | unsigned char name[4][MAX_NAME_LEN]; |
149 | unsigned char reg_cache[REG_CACHE_SIZE]; | ||
150 | }; | 149 | }; |
151 | 150 | ||
152 | /* -9450dB to 0dB in 150dB steps ( mute instead of -9450dB) */ | 151 | /* -9450dB to 0dB in 150dB steps ( mute instead of -9450dB) */ |
diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index a007bd7326fd..da46479bfcfa 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | /* codec private data */ | 24 | /* codec private data */ |
25 | struct ad193x_priv { | 25 | struct ad193x_priv { |
26 | u8 reg_cache[AD193X_NUM_REGS]; | ||
27 | enum snd_soc_control_type bus_type; | 26 | enum snd_soc_control_type bus_type; |
28 | void *control_data; | 27 | void *control_data; |
29 | int sysclk; | 28 | int sysclk; |
diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c index 4faf10553a30..2ec75abfa3e9 100644 --- a/sound/soc/codecs/ak4671.c +++ b/sound/soc/codecs/ak4671.c | |||
@@ -27,7 +27,6 @@ | |||
27 | struct ak4671_priv { | 27 | struct ak4671_priv { |
28 | enum snd_soc_control_type control_type; | 28 | enum snd_soc_control_type control_type; |
29 | void *control_data; | 29 | void *control_data; |
30 | u8 reg_cache[AK4671_CACHEREGNUM]; | ||
31 | }; | 30 | }; |
32 | 31 | ||
33 | /* ak4671 register cache & default register settings */ | 32 | /* ak4671 register cache & default register settings */ |
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 6d4bdc609ac8..3a582caa6ef9 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c | |||
@@ -114,7 +114,6 @@ static const char *supply_names[] = { | |||
114 | struct cs4270_private { | 114 | struct cs4270_private { |
115 | enum snd_soc_control_type control_type; | 115 | enum snd_soc_control_type control_type; |
116 | void *control_data; | 116 | void *control_data; |
117 | u8 reg_cache[CS4270_NUMREGS]; | ||
118 | unsigned int mclk; /* Input frequency of the MCLK pin */ | 117 | unsigned int mclk; /* Input frequency of the MCLK pin */ |
119 | unsigned int mode; /* The mode (I2S or left-justified) */ | 118 | unsigned int mode; /* The mode (I2S or left-justified) */ |
120 | unsigned int slave_mode; | 119 | unsigned int slave_mode; |
diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index d4e60dc45bf6..8fb7070108dd 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c | |||
@@ -46,7 +46,6 @@ struct cs42l51_private { | |||
46 | unsigned int mclk; | 46 | unsigned int mclk; |
47 | unsigned int audio_mode; /* The mode (I2S or left-justified) */ | 47 | unsigned int audio_mode; /* The mode (I2S or left-justified) */ |
48 | enum master_slave_mode func; | 48 | enum master_slave_mode func; |
49 | u8 reg_cache[CS42L51_NUMREGS]; | ||
50 | }; | 49 | }; |
51 | 50 | ||
52 | #define CS42L51_FORMATS ( \ | 51 | #define CS42L51_FORMATS ( \ |
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c index a9521acad99c..03d1e860d229 100644 --- a/sound/soc/codecs/cx20442.c +++ b/sound/soc/codecs/cx20442.c | |||
@@ -26,7 +26,6 @@ | |||
26 | struct cx20442_priv { | 26 | struct cx20442_priv { |
27 | enum snd_soc_control_type control_type; | 27 | enum snd_soc_control_type control_type; |
28 | void *control_data; | 28 | void *control_data; |
29 | u8 reg_cache[1]; | ||
30 | }; | 29 | }; |
31 | 30 | ||
32 | #define CX20442_PM 0x0 | 31 | #define CX20442_PM 0x0 |
diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index 68f0ae47f608..e2a7608d3944 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c | |||
@@ -30,7 +30,6 @@ MODULE_LICENSE("GPL"); | |||
30 | struct aic26 { | 30 | struct aic26 { |
31 | struct spi_device *spi; | 31 | struct spi_device *spi; |
32 | struct snd_soc_codec codec; | 32 | struct snd_soc_codec codec; |
33 | u16 reg_cache[AIC26_NUM_REGS]; /* shadow registers */ | ||
34 | int master; | 33 | int master; |
35 | int datfm; | 34 | int datfm; |
36 | int mclk; | 35 | int mclk; |
@@ -354,7 +353,6 @@ static DEVICE_ATTR(keyclick, 0644, aic26_keyclick_show, aic26_keyclick_set); | |||
354 | */ | 353 | */ |
355 | static int aic26_probe(struct snd_soc_codec *codec) | 354 | static int aic26_probe(struct snd_soc_codec *codec) |
356 | { | 355 | { |
357 | struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec); | ||
358 | int ret, err, i, reg; | 356 | int ret, err, i, reg; |
359 | 357 | ||
360 | dev_info(codec->dev, "Probing AIC26 SoC CODEC driver\n"); | 358 | dev_info(codec->dev, "Probing AIC26 SoC CODEC driver\n"); |
@@ -372,7 +370,7 @@ static int aic26_probe(struct snd_soc_codec *codec) | |||
372 | aic26_reg_write(codec, AIC26_REG_AUDIO_CTRL3, reg); | 370 | aic26_reg_write(codec, AIC26_REG_AUDIO_CTRL3, reg); |
373 | 371 | ||
374 | /* Fill register cache */ | 372 | /* Fill register cache */ |
375 | for (i = 0; i < ARRAY_SIZE(aic26->reg_cache); i++) | 373 | for (i = 0; i < codec->driver->reg_cache_size; i++) |
376 | aic26_reg_read(codec, i); | 374 | aic26_reg_read(codec, i); |
377 | 375 | ||
378 | /* Register the sysfs files for debugging */ | 376 | /* Register the sysfs files for debugging */ |
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index 800980e2e9ab..c5ca8cfea60f 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c | |||
@@ -35,7 +35,6 @@ | |||
35 | /* codec private data */ | 35 | /* codec private data */ |
36 | struct uda1380_priv { | 36 | struct uda1380_priv { |
37 | struct snd_soc_codec *codec; | 37 | struct snd_soc_codec *codec; |
38 | u16 reg_cache[UDA1380_CACHEREGNUM]; | ||
39 | unsigned int dac_clk; | 38 | unsigned int dac_clk; |
40 | struct work_struct work; | 39 | struct work_struct work; |
41 | void *control_data; | 40 | void *control_data; |
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 0ebdecfd27a9..8f6b5ee6645b 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c | |||
@@ -190,7 +190,6 @@ static const char *wm8580_supply_names[WM8580_NUM_SUPPLIES] = { | |||
190 | struct wm8580_priv { | 190 | struct wm8580_priv { |
191 | enum snd_soc_control_type control_type; | 191 | enum snd_soc_control_type control_type; |
192 | struct regulator_bulk_data supplies[WM8580_NUM_SUPPLIES]; | 192 | struct regulator_bulk_data supplies[WM8580_NUM_SUPPLIES]; |
193 | u16 reg_cache[WM8580_MAX_REGISTER + 1]; | ||
194 | struct pll_state a; | 193 | struct pll_state a; |
195 | struct pll_state b; | 194 | struct pll_state b; |
196 | int sysclk[2]; | 195 | int sysclk[2]; |
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c index fec37ebfdb34..97c30382d3ff 100644 --- a/sound/soc/codecs/wm8711.c +++ b/sound/soc/codecs/wm8711.c | |||
@@ -33,7 +33,6 @@ | |||
33 | /* codec private data */ | 33 | /* codec private data */ |
34 | struct wm8711_priv { | 34 | struct wm8711_priv { |
35 | enum snd_soc_control_type bus_type; | 35 | enum snd_soc_control_type bus_type; |
36 | u16 reg_cache[WM8711_CACHEREGNUM]; | ||
37 | unsigned int sysclk; | 36 | unsigned int sysclk; |
38 | }; | 37 | }; |
39 | 38 | ||
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 71122dc36826..0a67c31b2663 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c | |||
@@ -43,7 +43,6 @@ static const char *wm8731_supply_names[WM8731_NUM_SUPPLIES] = { | |||
43 | struct wm8731_priv { | 43 | struct wm8731_priv { |
44 | enum snd_soc_control_type control_type; | 44 | enum snd_soc_control_type control_type; |
45 | struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES]; | 45 | struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES]; |
46 | u16 reg_cache[WM8731_CACHEREGNUM]; | ||
47 | unsigned int sysclk; | 46 | unsigned int sysclk; |
48 | int sysclk_type; | 47 | int sysclk_type; |
49 | int playback_fs; | 48 | int playback_fs; |
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 51280e96d721..38f38fddd190 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
@@ -52,7 +52,6 @@ static const u16 wm8750_reg[] = { | |||
52 | struct wm8750_priv { | 52 | struct wm8750_priv { |
53 | unsigned int sysclk; | 53 | unsigned int sysclk; |
54 | enum snd_soc_control_type control_type; | 54 | enum snd_soc_control_type control_type; |
55 | u16 reg_cache[ARRAY_SIZE(wm8750_reg)]; | ||
56 | }; | 55 | }; |
57 | 56 | ||
58 | #define wm8750_reset(c) snd_soc_write(c, WM8750_RESET, 0) | 57 | #define wm8750_reset(c) snd_soc_write(c, WM8750_RESET, 0) |
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index cfbaac1a0ead..cd0959926d12 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c | |||
@@ -139,7 +139,6 @@ | |||
139 | 139 | ||
140 | struct wm8900_priv { | 140 | struct wm8900_priv { |
141 | enum snd_soc_control_type control_type; | 141 | enum snd_soc_control_type control_type; |
142 | u16 reg_cache[WM8900_MAXREG]; | ||
143 | 142 | ||
144 | u32 fll_in; /* FLL input frequency */ | 143 | u32 fll_in; /* FLL input frequency */ |
145 | u32 fll_out; /* FLL output frequency */ | 144 | u32 fll_out; /* FLL output frequency */ |
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index b9843f72c455..987476a5895f 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c | |||
@@ -214,8 +214,6 @@ static u16 wm8903_reg_defaults[] = { | |||
214 | 214 | ||
215 | struct wm8903_priv { | 215 | struct wm8903_priv { |
216 | 216 | ||
217 | u16 reg_cache[ARRAY_SIZE(wm8903_reg_defaults)]; | ||
218 | |||
219 | int sysclk; | 217 | int sysclk; |
220 | int irq; | 218 | int irq; |
221 | 219 | ||
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 381934fff4ec..fc7761fa8bd3 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c | |||
@@ -42,7 +42,6 @@ | |||
42 | 42 | ||
43 | struct wm8940_priv { | 43 | struct wm8940_priv { |
44 | unsigned int sysclk; | 44 | unsigned int sysclk; |
45 | u16 reg_cache[WM8940_CACHEREGNUM]; | ||
46 | enum snd_soc_control_type control_type; | 45 | enum snd_soc_control_type control_type; |
47 | void *control_data; | 46 | void *control_data; |
48 | }; | 47 | }; |
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 054f5737319c..2bb856156eda 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c | |||
@@ -71,7 +71,6 @@ static const u16 wm8960_reg[WM8960_CACHEREGNUM] = { | |||
71 | }; | 71 | }; |
72 | 72 | ||
73 | struct wm8960_priv { | 73 | struct wm8960_priv { |
74 | u16 reg_cache[WM8960_CACHEREGNUM]; | ||
75 | enum snd_soc_control_type control_type; | 74 | enum snd_soc_control_type control_type; |
76 | void *control_data; | 75 | void *control_data; |
77 | int (*set_bias_level)(struct snd_soc_codec *, | 76 | int (*set_bias_level)(struct snd_soc_codec *, |
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c index 6b22ef200e20..55252e7d02c9 100644 --- a/sound/soc/codecs/wm8961.c +++ b/sound/soc/codecs/wm8961.c | |||
@@ -289,7 +289,6 @@ static u16 wm8961_reg_defaults[] = { | |||
289 | struct wm8961_priv { | 289 | struct wm8961_priv { |
290 | enum snd_soc_control_type control_type; | 290 | enum snd_soc_control_type control_type; |
291 | int sysclk; | 291 | int sysclk; |
292 | u16 reg_cache[WM8961_MAX_REGISTER]; | ||
293 | }; | 292 | }; |
294 | 293 | ||
295 | static int wm8961_volatile_register(unsigned int reg) | 294 | static int wm8961_volatile_register(unsigned int reg) |
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index 5d286427532a..ca646a822444 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c | |||
@@ -51,7 +51,6 @@ static const u16 wm8974_reg[WM8974_CACHEREGNUM] = { | |||
51 | 51 | ||
52 | struct wm8974_priv { | 52 | struct wm8974_priv { |
53 | enum snd_soc_control_type control_type; | 53 | enum snd_soc_control_type control_type; |
54 | u16 reg_cache[WM8974_CACHEREGNUM]; | ||
55 | }; | 54 | }; |
56 | 55 | ||
57 | #define wm8974_reset(c) snd_soc_write(c, WM8974_RESET, 0) | 56 | #define wm8974_reset(c) snd_soc_write(c, WM8974_RESET, 0) |
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index a195af92b425..4bbc3442703f 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c | |||
@@ -59,7 +59,6 @@ struct wm8978_priv { | |||
59 | unsigned int f_opclk; | 59 | unsigned int f_opclk; |
60 | int mclk_idx; | 60 | int mclk_idx; |
61 | enum wm8978_sysclk_src sysclk; | 61 | enum wm8978_sysclk_src sysclk; |
62 | u16 reg_cache[WM8978_CACHEREGNUM]; | ||
63 | }; | 62 | }; |
64 | 63 | ||
65 | static const char *wm8978_companding[] = {"Off", "NC", "u-law", "A-law"}; | 64 | static const char *wm8978_companding[] = {"Off", "NC", "u-law", "A-law"}; |
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index 65807b15a2cc..d7170f1381aa 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c | |||
@@ -53,7 +53,6 @@ struct wm8988_priv { | |||
53 | unsigned int sysclk; | 53 | unsigned int sysclk; |
54 | enum snd_soc_control_type control_type; | 54 | enum snd_soc_control_type control_type; |
55 | struct snd_pcm_hw_constraint_list *sysclk_constraints; | 55 | struct snd_pcm_hw_constraint_list *sysclk_constraints; |
56 | u16 reg_cache[WM8988_NUM_REG]; | ||
57 | }; | 56 | }; |
58 | 57 | ||
59 | 58 | ||
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index 15f34a26debf..18c0d9ce7c32 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c | |||
@@ -225,7 +225,6 @@ static struct { | |||
225 | 225 | ||
226 | struct wm8993_priv { | 226 | struct wm8993_priv { |
227 | struct wm_hubs_data hubs_data; | 227 | struct wm_hubs_data hubs_data; |
228 | u16 reg_cache[WM8993_REGISTER_COUNT]; | ||
229 | struct regulator_bulk_data supplies[WM8993_NUM_SUPPLIES]; | 228 | struct regulator_bulk_data supplies[WM8993_NUM_SUPPLIES]; |
230 | struct wm8993_platform_data pdata; | 229 | struct wm8993_platform_data pdata; |
231 | enum snd_soc_control_type control_type; | 230 | enum snd_soc_control_type control_type; |
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index e5055b28c638..702db6937d4f 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c | |||
@@ -157,7 +157,6 @@ static struct { | |||
157 | struct wm9081_priv { | 157 | struct wm9081_priv { |
158 | enum snd_soc_control_type control_type; | 158 | enum snd_soc_control_type control_type; |
159 | void *control_data; | 159 | void *control_data; |
160 | u16 reg_cache[WM9081_MAX_REGISTER + 1]; | ||
161 | int sysclk_source; | 160 | int sysclk_source; |
162 | int mclk_rate; | 161 | int mclk_rate; |
163 | int sysclk_rate; | 162 | int sysclk_rate; |