From: Vitaly Rodionov Date: Thu, 23 Oct 2025 09:03:10 +0000 (+0100) Subject: ASoC: cs530x: Sort #include directives and tydy up whitespaces X-Git-Tag: v6.19-rc1~156^2~3^2~83^2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e0722a77b4e263854a812c9c106ddef8fd56720;p=thirdparty%2Fkernel%2Flinux.git ASoC: cs530x: Sort #include directives and tydy up whitespaces Signed-off-by: Vitaly Rodionov Link: https://patch.msgid.link/20251023090327.58275-3-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 be80dcad36474..d6b7883ba7b9a 100644 --- a/sound/soc/codecs/cs530x-i2c.c +++ b/sound/soc/codecs/cs530x-i2c.c @@ -48,7 +48,7 @@ static int cs530x_i2c_probe(struct i2c_client *client) cs530x->regmap = devm_regmap_init_i2c(client, &cs530x_regmap); if (IS_ERR(cs530x->regmap)) return dev_err_probe(&client->dev, PTR_ERR(cs530x->regmap), - "Failed to allocate register map\n"); + "Failed to allocate register map\n"); cs530x->devtype = (uintptr_t)i2c_get_match_data(client); cs530x->dev = &client->dev; diff --git a/sound/soc/codecs/cs530x.c b/sound/soc/codecs/cs530x.c index c8959a9525c1e..498005674a3f4 100644 --- a/sound/soc/codecs/cs530x.c +++ b/sound/soc/codecs/cs530x.c @@ -5,17 +5,17 @@ // Copyright (C) 2024-2025 Cirrus Logic, Inc. and // Cirrus Logic International Semiconductor Ltd. -#include #include #include #include -#include #include -#include -#include #include #include #include +#include +#include +#include +#include #include #include @@ -104,7 +104,7 @@ static bool cs530x_writeable_register(struct device *dev, unsigned int reg) } static int cs530x_put_volsw_vu(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) + struct snd_ctl_elem_value *ucontrol) { struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); @@ -224,7 +224,7 @@ SOC_SINGLE("ADC8 Invert Switch", CS530X_IN_INV, CS530X_IN8_INV_SHIFT, 1, 0), }; static int cs530x_adc_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) + struct snd_kcontrol *kcontrol, int event) { struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component); @@ -236,9 +236,9 @@ static int cs530x_adc_event(struct snd_soc_dapm_widget *w, break; case SND_SOC_DAPM_POST_PMU: regmap_clear_bits(regmap, CS530X_IN_VOL_CTRL1_0 + - (w->shift * 2), CS530X_IN_MUTE); + (w->shift * 2), CS530X_IN_MUTE); regmap_clear_bits(regmap, CS530X_IN_VOL_CTRL1_0 + - ((w->shift+1) * 2), CS530X_IN_MUTE); + ((w->shift + 1) * 2), CS530X_IN_MUTE); cs530x->adc_pairs_count--; if (!cs530x->adc_pairs_count) { @@ -249,9 +249,9 @@ static int cs530x_adc_event(struct snd_soc_dapm_widget *w, break; case SND_SOC_DAPM_PRE_PMD: regmap_set_bits(regmap, CS530X_IN_VOL_CTRL1_0 + - (w->shift * 2), CS530X_IN_MUTE); + (w->shift * 2), CS530X_IN_MUTE); regmap_set_bits(regmap, CS530X_IN_VOL_CTRL1_0 + - ((w->shift+1) * 2), CS530X_IN_MUTE); + ((w->shift + 1) * 2), CS530X_IN_MUTE); return regmap_write(regmap, CS530X_IN_VOL_CTRL5, CS530X_IN_VU); default: @@ -263,16 +263,12 @@ static int cs530x_adc_event(struct snd_soc_dapm_widget *w, static const struct snd_kcontrol_new adc12_ctrl = SOC_DAPM_SINGLE_VIRT("Switch", 1); - static const struct snd_kcontrol_new adc34_ctrl = SOC_DAPM_SINGLE_VIRT("Switch", 1); - static const struct snd_kcontrol_new adc56_ctrl = SOC_DAPM_SINGLE_VIRT("Switch", 1); - static const struct snd_kcontrol_new adc78_ctrl = SOC_DAPM_SINGLE_VIRT("Switch", 1); - static const struct snd_kcontrol_new in_hpf_ctrl = SOC_DAPM_SINGLE_VIRT("Switch", 1); @@ -450,7 +446,7 @@ static int cs530x_set_bclk(struct snd_soc_component *component, const int freq) } static int cs530x_set_pll_refclk(struct snd_soc_component *component, - const unsigned int freq) + const unsigned int freq) { struct cs530x_priv *priv = snd_soc_component_get_drvdata(component); struct regmap *regmap = priv->regmap; @@ -492,7 +488,6 @@ static int cs530x_hw_params(struct snd_pcm_substream *substream, int ret = 0, fs = params_rate(params), bclk; unsigned int fs_val; - switch (fs) { case 32000: fs_val = CS530X_FS_32K; @@ -540,7 +535,7 @@ static int cs530x_hw_params(struct snd_pcm_substream *substream, } if (!regmap_test_bits(regmap, CS530X_CLK_CFG_0, - CS530X_PLL_REFCLK_SRC_MASK)) { + CS530X_PLL_REFCLK_SRC_MASK)) { ret = cs530x_set_pll_refclk(component, bclk); if (ret) return ret; @@ -614,7 +609,7 @@ static bool cs530x_check_mclk_freq(struct snd_soc_component *component, } static int cs530x_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, - unsigned int rx_mask, int slots, int slot_width) + unsigned int rx_mask, int slots, int slot_width) { struct snd_soc_component *component = dai->component; struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component); @@ -686,8 +681,8 @@ static const struct snd_soc_dai_driver cs530x_dai = { }; static int cs530x_set_pll(struct snd_soc_component *component, int pll_id, - int source, unsigned int freq_in, - unsigned int freq_out) + int source, unsigned int freq_in, + unsigned int freq_out) { struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component); struct regmap *regmap = cs530x->regmap; @@ -743,7 +738,6 @@ static int cs530x_component_probe(struct snd_soc_component *component) cs530x_in_sum_4ch_controls, num_widgets); break; - case CS5308: cs530x_add_12_adc_widgets(component); cs530x_add_34_adc_widgets(component); @@ -775,7 +769,7 @@ static int cs530x_component_probe(struct snd_soc_component *component) } static int cs530x_set_sysclk(struct snd_soc_component *component, int clk_id, - int source, unsigned int freq, int dir) + int source, unsigned int freq, int dir) { struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component); struct regmap *regmap = cs530x->regmap; @@ -895,8 +889,8 @@ int cs530x_probe(struct cs530x_priv *cs530x) int ret, i; cs530x->dev_dai = devm_kmemdup(dev, &cs530x_dai, - sizeof(*(cs530x->dev_dai)), - GFP_KERNEL); + sizeof(*(cs530x->dev_dai)), + GFP_KERNEL); if (!cs530x->dev_dai) return -ENOMEM; @@ -914,10 +908,10 @@ int cs530x_probe(struct cs530x_priv *cs530x) return dev_err_probe(dev, ret, "Failed to enable supplies"); cs530x->reset_gpio = devm_gpiod_get_optional(dev, "reset", - GPIOD_OUT_HIGH); + GPIOD_OUT_HIGH); if (IS_ERR(cs530x->reset_gpio)) { ret = dev_err_probe(dev, PTR_ERR(cs530x->reset_gpio), - "Reset gpio not available\n"); + "Reset gpio not available\n"); goto err_regulator; } @@ -947,7 +941,8 @@ int cs530x_probe(struct cs530x_priv *cs530x) cs530x->dev_dai->capture.channels_max = cs530x->num_adcs; ret = devm_snd_soc_register_component(dev, - &soc_component_dev_cs530x, cs530x->dev_dai, 1); + &soc_component_dev_cs530x, + cs530x->dev_dai, 1); if (ret) { dev_err_probe(dev, ret, "Can't register cs530x component\n"); goto err_reset;