ASoC: soc-component: remove component->val_bytes

component has component->val_bytes which is set via
snd_soc_component_setup_regmap(). But it can be calculated via
component->regmap. No need to keep it as component->val_bytes.

No one is using component->val_bytes. Remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/874imlzyv8.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index c08922290cf1a26ef01d3a3754c116df4f3be7aa..65dc540246aa2d9159b30f100d51d2707f123d42 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -224,7 +224,6 @@ struct snd_soc_component {
        int num_dai;
 
        struct regmap *regmap;
-       int val_bytes;
 
        struct mutex io_mutex;
 
@@ -328,7 +327,6 @@ int snd_soc_component_set_bias_level(struct snd_soc_component *component,
                                     enum snd_soc_bias_level level);
 
 int snd_soc_component_regmap_val_bytes(struct snd_soc_component *component);
-void snd_soc_component_setup_regmap(struct snd_soc_component *component);
 #ifdef CONFIG_REGMAP
 void snd_soc_component_init_regmap(struct snd_soc_component *component,
                                   struct regmap *regmap);

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 9dc2cbdc2dda7582f7a544b75d6d282e1bb20848..2eaad5db213004b3a2112bca0466ce68b25487bb 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -342,15 +342,6 @@ int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
        return -ENOTSUPP;
 }
 
-void snd_soc_component_setup_regmap(struct snd_soc_component *component)
-{
-       int val_bytes = regmap_get_val_bytes(component->regmap);
-
-       /* Errors are legitimate for non-integer byte multiples */
-       if (val_bytes > 0)
-               component->val_bytes = val_bytes;
-}
-
 int snd_soc_component_regmap_val_bytes(struct snd_soc_component *component)
 {
        int val_bytes;
@@ -385,7 +376,6 @@ void snd_soc_component_init_regmap(struct snd_soc_component *component,
                                   struct regmap *regmap)
 {
        component->regmap = regmap;
-       snd_soc_component_setup_regmap(component);
 }
 EXPORT_SYMBOL_GPL(snd_soc_component_init_regmap);
 

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 573693e21780aa1b85ba7a39f7ded2406e167bea..112857a5300b28da7ce832348d99db3adc2f03c5 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2909,8 +2909,6 @@ int snd_soc_add_component(struct snd_soc_component *component,
                if (!component->regmap)
                        component->regmap = dev_get_regmap(component->dev,
                                                           NULL);
-               if (component->regmap)
-                       snd_soc_component_setup_regmap(component);
        }
 
        /* see for_each_component */