From: Simon Trimmer Date: Thu, 23 Oct 2025 09:03:18 +0000 (+0100) Subject: ASoC: cs530x: Rename i2c related structures X-Git-Tag: v6.19-rc1~156^2~3^2~83^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38ff69586bbb3a823dd501972e17075374b685a1;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Vitaly Rodionov Link: https://patch.msgid.link/20251023090327.58275-11-vitalyr@opensource.cirrus.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/cs530x-i2c.c b/sound/soc/codecs/cs530x-i2c.c index ab410826f7778..52b02ceaa7e3f 100644 --- 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 e74e6ffa73320..79f615d5b1210 100644 --- 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 2c773c4b6b925..2a7b7d01ecfbb 100644 --- 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