diff options
| author | Richard Fitzgerald <rf@opensource.cirrus.com> | 2022-08-17 14:23:45 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-08-17 14:58:48 +0200 |
| commit | dbd231732c99e336c2ece4a70896139e7f5a51a7 (patch) | |
| tree | 99c3ba8a04938903a2c99052633a58dd89966e72 /sound/soc | |
| parent | ASoC: cs42l42: Add include dependencies to cs42l42.h (diff) | |
| download | linux-dbd231732c99e336c2ece4a70896139e7f5a51a7.tar.xz linux-dbd231732c99e336c2ece4a70896139e7f5a51a7.zip | |
ASoC: cs42l42: Move cs42l42_supply_names to .c file
The array of supply name strings doesn't need to be in the header file.
Move it to the .c file.
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220817122347.1356773-4-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/cs42l42.c | 9 | ||||
| -rw-r--r-- | sound/soc/codecs/cs42l42.h | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index c212112cf87e..abe3f91274fb 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -37,6 +37,14 @@ #include "cs42l42.h" #include "cirrus_legacy.h" +static const char * const cs42l42_supply_names[] = { + "VA", + "VP", + "VCP", + "VD_FILT", + "VL", +}; + static const struct reg_default cs42l42_reg_defaults[] = { { CS42L42_FRZ_CTL, 0x00 }, { CS42L42_SRC_CTL, 0x10 }, @@ -2214,6 +2222,7 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client) return ret; } + BUILD_BUG_ON(ARRAY_SIZE(cs42l42_supply_names) != ARRAY_SIZE(cs42l42->supplies)); for (i = 0; i < ARRAY_SIZE(cs42l42->supplies); i++) cs42l42->supplies[i].supply = cs42l42_supply_names[i]; diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h index 1d53e0e050ee..50299c9f283a 100644 --- a/sound/soc/codecs/cs42l42.h +++ b/sound/soc/codecs/cs42l42.h @@ -21,14 +21,6 @@ #include <sound/jack.h> #include <sound/cs42l42.h> -static const char *const cs42l42_supply_names[CS42L42_NUM_SUPPLIES] = { - "VA", - "VP", - "VCP", - "VD_FILT", - "VL", -}; - struct cs42l42_private { struct regmap *regmap; struct device *dev; |