ASoC: tlv320adcx140: Fix various style errors and warnings

Fix white space issues and remove else case where it was not needed.
Convert "static const char *" to "static const char * const"

Fixes: 689c7655b50 ("ASoC: tlv320adcx140: Add the tlv320adcx140 codec driver family")
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Link: https://lore.kernel.org/r/20200728164339.16841-1-dmurphy@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tlv320adcx140.c b/sound/soc/codecs/tlv320adcx140.c
index 49dcdd72e5c6d26627a705ec377acfc38025f48d..938c5ef17e61879d9bedd6f51f3c482b10a67190 100644 (file)
--- a/sound/soc/codecs/tlv320adcx140.c
+++ b/sound/soc/codecs/tlv320adcx140.c
@@ -218,8 +218,8 @@ static const struct snd_kcontrol_new in4_resistor_controls[] = {
 };
 
 /* Analog/Digital Selection */
-static const char *adcx140_mic_sel_text[] = {"Analog", "Line In", "Digital"};
-static const char *adcx140_analog_sel_text[] = {"Analog", "Line In"};
+static const char * const adcx140_mic_sel_text[] = {"Analog", "Line In", "Digital"};
+static const char * const adcx140_analog_sel_text[] = {"Analog", "Line In"};
 
 static SOC_ENUM_SINGLE_DECL(adcx140_mic1p_enum,
                            ADCX140_CH1_CFG0, 5,
@@ -598,7 +598,7 @@ static int adcx140_reset(struct adcx140_priv *adcx140)
                gpiod_direction_output(adcx140->gpio_reset, 1);
        } else {
                ret = regmap_write(adcx140->regmap, ADCX140_SW_RESET,
-                         ADCX140_RESET);
+                                  ADCX140_RESET);
        }
 
        /* 8.4.2: wait >= 10 ms after entering sleep mode. */
@@ -841,7 +841,7 @@ static int adcx140_codec_probe(struct snd_soc_component *component)
        if (ret)
                goto out;
 
-       if(adcx140->supply_areg == NULL)
+       if (adcx140->supply_areg == NULL)
                sleep_cfg_val |= ADCX140_AREG_INTERNAL;
 
        ret = regmap_write(adcx140->regmap, ADCX140_SLEEP_CFG, sleep_cfg_val);
@@ -942,8 +942,8 @@ static int adcx140_i2c_probe(struct i2c_client *i2c,
        if (IS_ERR(adcx140->supply_areg)) {
                if (PTR_ERR(adcx140->supply_areg) == -EPROBE_DEFER)
                        return -EPROBE_DEFER;
-               else
-                       adcx140->supply_areg = NULL;
+
+               adcx140->supply_areg = NULL;
        } else {
                ret = regulator_enable(adcx140->supply_areg);
                if (ret) {