ASoC: cs530x: Rename i2c related structures

In preparation for SPI support these structures should be renamed to
reflect that they are for i2c.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com>
Link: https://patch.msgid.link/20251023090327.58275-11-vitalyr@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs530x-i2c.c b/sound/soc/codecs/cs530x-i2c.c
index ab410826f7778f31ed0589d2927865d8dc01b42c..52b02ceaa7e3fac69765d647e3a8c1e129728acf 100644 (file)
--- a/sound/soc/codecs/cs530x-i2c.c
+++ b/sound/soc/codecs/cs530x-i2c.c
@@ -61,7 +61,7 @@ static int cs530x_i2c_probe(struct i2c_client *client)
 
        i2c_set_clientdata(client, cs530x);
 
-       cs530x->regmap = devm_regmap_init_i2c(client, &cs530x_regmap);
+       cs530x->regmap = devm_regmap_init_i2c(client, &cs530x_regmap_i2c);
        if (IS_ERR(cs530x->regmap))
                return dev_err_probe(&client->dev, PTR_ERR(cs530x->regmap),
                                     "Failed to allocate register map\n");

diff --git a/sound/soc/codecs/cs530x.c b/sound/soc/codecs/cs530x.c
index e74e6ffa733209e01d13dfdc76aa1215ae81956f..79f615d5b12100c88a793567321b04ac47f7b0fc 100644 (file)
--- a/sound/soc/codecs/cs530x.c
+++ b/sound/soc/codecs/cs530x.c
@@ -1128,7 +1128,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs530x = {
        .endianness             = 1,
 };
 
-const struct regmap_config cs530x_regmap = {
+const struct regmap_config cs530x_regmap_i2c = {
        .reg_bits = 16,
        .val_bits = 16,
 
@@ -1140,7 +1140,7 @@ const struct regmap_config cs530x_regmap = {
        .reg_defaults = cs530x_reg_defaults,
        .num_reg_defaults = ARRAY_SIZE(cs530x_reg_defaults),
 };
-EXPORT_SYMBOL_NS_GPL(cs530x_regmap, "SND_SOC_CS530X");
+EXPORT_SYMBOL_NS_GPL(cs530x_regmap_i2c, "SND_SOC_CS530X");
 
 static int cs530x_check_device_id(struct cs530x_priv *cs530x)
 {

diff --git a/sound/soc/codecs/cs530x.h b/sound/soc/codecs/cs530x.h
index 2c773c4b6b9250c3ca091bd81b4550126c4d7b3f..2a7b7d01ecfbb6c04d301d8c168f7abcb0a9c07e 100644 (file)
--- a/sound/soc/codecs/cs530x.h
+++ b/sound/soc/codecs/cs530x.h
@@ -246,7 +246,7 @@ struct cs530x_priv {
        struct gpio_desc *reset_gpio;
 };
 
-extern const struct regmap_config cs530x_regmap;
+extern const struct regmap_config cs530x_regmap_i2c;
 int cs530x_probe(struct cs530x_priv *cs530x);
 
 #endif