1 From 1b41c69264d7233a3e9a0aa36333ee22a5a049e9 Mon Sep 17 00:00:00 2001
2 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
3 Date: Fri, 26 Mar 2021 16:59:12 -0500
4 Subject: [PATCH 186/247] ASoC: atmel: fix shadowed variable
8 sound/soc/atmel/atmel-classd.c:51:14: style: Local variable 'pwm_type'
9 shadows outer variable [shadowVariable]
12 sound/soc/atmel/atmel-classd.c:226:27: note: Shadowed declaration
13 static const char * const pwm_type[] = {
15 sound/soc/atmel/atmel-classd.c:51:14: note: Shadow variable
19 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
20 Reviewed-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
21 Link: https://lore.kernel.org/r/20210326215927.936377-3-pierre-louis.bossart@linux.intel.com
22 Signed-off-by: Mark Brown <broonie@kernel.org>
24 sound/soc/atmel/atmel-classd.c | 6 +++---
25 1 file changed, 3 insertions(+), 3 deletions(-)
27 diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
28 index b1a28a9382fb..6023369e0f1a 100644
29 --- a/sound/soc/atmel/atmel-classd.c
30 +++ b/sound/soc/atmel/atmel-classd.c
31 @@ -48,7 +48,7 @@ static struct atmel_classd_pdata *atmel_classd_dt_init(struct device *dev)
33 struct device_node *np = dev->of_node;
34 struct atmel_classd_pdata *pdata;
35 - const char *pwm_type;
36 + const char *pwm_type_s;
40 @@ -60,8 +60,8 @@ static struct atmel_classd_pdata *atmel_classd_dt_init(struct device *dev)
42 return ERR_PTR(-ENOMEM);
44 - ret = of_property_read_string(np, "atmel,pwm-type", &pwm_type);
45 - if ((ret == 0) && (strcmp(pwm_type, "diff") == 0))
46 + ret = of_property_read_string(np, "atmel,pwm-type", &pwm_type_s);
47 + if ((ret == 0) && (strcmp(pwm_type_s, "diff") == 0))
48 pdata->pwm_type = CLASSD_MR_PWMTYP_DIFF;
50 pdata->pwm_type = CLASSD_MR_PWMTYP_SINGLE;