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>

diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index c212112cf87ee90fc201881897115dac2fccad68..abe3f91274fb215ec8750040df79f3fb9b9efc13 100644 (file)
--- 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 1d53e0e050eeecb820e951eaaf4b9d56465d01c8..50299c9f283a54ce65457dc1269006691c786756 100644 (file)
--- 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;