* [PATCH] ASoC: max98088: clean up some inconsistent indenting
@ 2023-06-08 7:55 Jiapeng Chong
2023-06-08 15:18 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Jiapeng Chong @ 2023-06-08 7:55 UTC (permalink / raw)
To: lgirdwood
Cc: broonie, perex, tiwai, alsa-devel, linux-kernel, Jiapeng Chong,
Abaci Robot
No functional modification involved.
sound/soc/codecs/max98088.c:316 m98088_eq_band() warn: inconsistent indenting.
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=5461
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
sound/soc/codecs/max98088.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index fb136e2b849b..8b56ee550c09 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -310,24 +310,24 @@ static const struct regmap_config max98088_regmap = {
static void m98088_eq_band(struct snd_soc_component *component, unsigned int dai,
unsigned int band, u16 *coefs)
{
- unsigned int eq_reg;
- unsigned int i;
+ unsigned int eq_reg;
+ unsigned int i;
if (WARN_ON(band > 4) ||
WARN_ON(dai > 1))
return;
- /* Load the base register address */
- eq_reg = dai ? M98088_REG_84_DAI2_EQ_BASE : M98088_REG_52_DAI1_EQ_BASE;
+ /* Load the base register address */
+ eq_reg = dai ? M98088_REG_84_DAI2_EQ_BASE : M98088_REG_52_DAI1_EQ_BASE;
- /* Add the band address offset, note adjustment for word address */
- eq_reg += band * (M98088_COEFS_PER_BAND << 1);
+ /* Add the band address offset, note adjustment for word address */
+ eq_reg += band * (M98088_COEFS_PER_BAND << 1);
- /* Step through the registers and coefs */
- for (i = 0; i < M98088_COEFS_PER_BAND; i++) {
- snd_soc_component_write(component, eq_reg++, M98088_BYTE1(coefs[i]));
- snd_soc_component_write(component, eq_reg++, M98088_BYTE0(coefs[i]));
- }
+ /* Step through the registers and coefs */
+ for (i = 0; i < M98088_COEFS_PER_BAND; i++) {
+ snd_soc_component_write(component, eq_reg++, M98088_BYTE1(coefs[i]));
+ snd_soc_component_write(component, eq_reg++, M98088_BYTE0(coefs[i]));
+ }
}
/*
--
2.20.1.7.g153144c
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: max98088: clean up some inconsistent indenting
2023-06-08 7:55 [PATCH] ASoC: max98088: clean up some inconsistent indenting Jiapeng Chong
@ 2023-06-08 15:18 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2023-06-08 15:18 UTC (permalink / raw)
To: lgirdwood, Jiapeng Chong
Cc: perex, tiwai, alsa-devel, linux-kernel, Abaci Robot
On Thu, 08 Jun 2023 15:55:40 +0800, Jiapeng Chong wrote:
> No functional modification involved.
>
> sound/soc/codecs/max98088.c:316 m98088_eq_band() warn: inconsistent indenting.
>
>
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: max98088: clean up some inconsistent indenting
commit: 3b3a8d6d34a3ace4d49beb6f69ebb0d3cfaf0479
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ASoC: max98088: clean up some inconsistent indenting
@ 2022-04-07 7:41 ` Jiapeng Chong
0 siblings, 0 replies; 4+ messages in thread
From: Jiapeng Chong @ 2022-04-07 7:41 UTC (permalink / raw)
To: lgirdwood
Cc: broonie, perex, tiwai, alsa-devel, linux-kernel, Jiapeng Chong,
Abaci Robot
Eliminate the follow smatch warning:
sound/soc/codecs/max98088.c:1112 max98088_dai_set_sysclk() warn:
inconsistent indenting.
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
sound/soc/codecs/max98088.c | 56 ++++++++++++++++++-------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index 429717d4ac5a..bc03ecd749f9 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -1102,44 +1102,44 @@ static int max98088_dai2_hw_params(struct snd_pcm_substream *substream,
static int max98088_dai_set_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir)
{
- struct snd_soc_component *component = dai->component;
- struct max98088_priv *max98088 = snd_soc_component_get_drvdata(component);
+ struct snd_soc_component *component = dai->component;
+ struct max98088_priv *max98088 = snd_soc_component_get_drvdata(component);
- /* Requested clock frequency is already setup */
- if (freq == max98088->sysclk)
- return 0;
+ /* Requested clock frequency is already setup */
+ if (freq == max98088->sysclk)
+ return 0;
if (!IS_ERR(max98088->mclk)) {
freq = clk_round_rate(max98088->mclk, freq);
clk_set_rate(max98088->mclk, freq);
}
- /* Setup clocks for slave mode, and using the PLL
- * PSCLK = 0x01 (when master clk is 10MHz to 20MHz)
- * 0x02 (when master clk is 20MHz to 30MHz)..
- */
- if ((freq >= 10000000) && (freq < 20000000)) {
- snd_soc_component_write(component, M98088_REG_10_SYS_CLK, 0x10);
- max98088->mclk_prescaler = 1;
- } else if ((freq >= 20000000) && (freq < 30000000)) {
- snd_soc_component_write(component, M98088_REG_10_SYS_CLK, 0x20);
- max98088->mclk_prescaler = 2;
- } else {
- dev_err(component->dev, "Invalid master clock frequency\n");
- return -EINVAL;
- }
+ /* Setup clocks for slave mode, and using the PLL
+ * PSCLK = 0x01 (when master clk is 10MHz to 20MHz)
+ * 0x02 (when master clk is 20MHz to 30MHz)..
+ */
+ if ((freq >= 10000000) && (freq < 20000000)) {
+ snd_soc_component_write(component, M98088_REG_10_SYS_CLK, 0x10);
+ max98088->mclk_prescaler = 1;
+ } else if ((freq >= 20000000) && (freq < 30000000)) {
+ snd_soc_component_write(component, M98088_REG_10_SYS_CLK, 0x20);
+ max98088->mclk_prescaler = 2;
+ } else {
+ dev_err(component->dev, "Invalid master clock frequency\n");
+ return -EINVAL;
+ }
- if (snd_soc_component_read(component, M98088_REG_51_PWR_SYS) & M98088_SHDNRUN) {
- snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS,
- M98088_SHDNRUN, 0);
- snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS,
- M98088_SHDNRUN, M98088_SHDNRUN);
- }
+ if (snd_soc_component_read(component, M98088_REG_51_PWR_SYS) & M98088_SHDNRUN) {
+ snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS,
+ M98088_SHDNRUN, 0);
+ snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS,
+ M98088_SHDNRUN, M98088_SHDNRUN);
+ }
- dev_dbg(dai->dev, "Clock source is %d at %uHz\n", clk_id, freq);
+ dev_dbg(dai->dev, "Clock source is %d at %uHz\n", clk_id, freq);
- max98088->sysclk = freq;
- return 0;
+ max98088->sysclk = freq;
+ return 0;
}
static int max98088_dai1_set_fmt(struct snd_soc_dai *codec_dai,
--
2.20.1.7.g153144c
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ASoC: max98088: clean up some inconsistent indenting
@ 2022-04-07 7:41 ` Jiapeng Chong
0 siblings, 0 replies; 4+ messages in thread
From: Jiapeng Chong @ 2022-04-07 7:41 UTC (permalink / raw)
To: lgirdwood
Cc: Jiapeng Chong, alsa-devel, Abaci Robot, linux-kernel, tiwai, broonie
Eliminate the follow smatch warning:
sound/soc/codecs/max98088.c:1112 max98088_dai_set_sysclk() warn:
inconsistent indenting.
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
sound/soc/codecs/max98088.c | 56 ++++++++++++++++++-------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index 429717d4ac5a..bc03ecd749f9 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -1102,44 +1102,44 @@ static int max98088_dai2_hw_params(struct snd_pcm_substream *substream,
static int max98088_dai_set_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir)
{
- struct snd_soc_component *component = dai->component;
- struct max98088_priv *max98088 = snd_soc_component_get_drvdata(component);
+ struct snd_soc_component *component = dai->component;
+ struct max98088_priv *max98088 = snd_soc_component_get_drvdata(component);
- /* Requested clock frequency is already setup */
- if (freq == max98088->sysclk)
- return 0;
+ /* Requested clock frequency is already setup */
+ if (freq == max98088->sysclk)
+ return 0;
if (!IS_ERR(max98088->mclk)) {
freq = clk_round_rate(max98088->mclk, freq);
clk_set_rate(max98088->mclk, freq);
}
- /* Setup clocks for slave mode, and using the PLL
- * PSCLK = 0x01 (when master clk is 10MHz to 20MHz)
- * 0x02 (when master clk is 20MHz to 30MHz)..
- */
- if ((freq >= 10000000) && (freq < 20000000)) {
- snd_soc_component_write(component, M98088_REG_10_SYS_CLK, 0x10);
- max98088->mclk_prescaler = 1;
- } else if ((freq >= 20000000) && (freq < 30000000)) {
- snd_soc_component_write(component, M98088_REG_10_SYS_CLK, 0x20);
- max98088->mclk_prescaler = 2;
- } else {
- dev_err(component->dev, "Invalid master clock frequency\n");
- return -EINVAL;
- }
+ /* Setup clocks for slave mode, and using the PLL
+ * PSCLK = 0x01 (when master clk is 10MHz to 20MHz)
+ * 0x02 (when master clk is 20MHz to 30MHz)..
+ */
+ if ((freq >= 10000000) && (freq < 20000000)) {
+ snd_soc_component_write(component, M98088_REG_10_SYS_CLK, 0x10);
+ max98088->mclk_prescaler = 1;
+ } else if ((freq >= 20000000) && (freq < 30000000)) {
+ snd_soc_component_write(component, M98088_REG_10_SYS_CLK, 0x20);
+ max98088->mclk_prescaler = 2;
+ } else {
+ dev_err(component->dev, "Invalid master clock frequency\n");
+ return -EINVAL;
+ }
- if (snd_soc_component_read(component, M98088_REG_51_PWR_SYS) & M98088_SHDNRUN) {
- snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS,
- M98088_SHDNRUN, 0);
- snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS,
- M98088_SHDNRUN, M98088_SHDNRUN);
- }
+ if (snd_soc_component_read(component, M98088_REG_51_PWR_SYS) & M98088_SHDNRUN) {
+ snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS,
+ M98088_SHDNRUN, 0);
+ snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS,
+ M98088_SHDNRUN, M98088_SHDNRUN);
+ }
- dev_dbg(dai->dev, "Clock source is %d at %uHz\n", clk_id, freq);
+ dev_dbg(dai->dev, "Clock source is %d at %uHz\n", clk_id, freq);
- max98088->sysclk = freq;
- return 0;
+ max98088->sysclk = freq;
+ return 0;
}
static int max98088_dai1_set_fmt(struct snd_soc_dai *codec_dai,
--
2.20.1.7.g153144c
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-08 15:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-08 7:55 [PATCH] ASoC: max98088: clean up some inconsistent indenting Jiapeng Chong
2023-06-08 15:18 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2022-04-07 7:41 Jiapeng Chong
2022-04-07 7:41 ` Jiapeng Chong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.