49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 1b41c69264d7233a3e9a0aa36333ee22a5a049e9 Mon Sep 17 00:00:00 2001
|
|
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Date: Fri, 26 Mar 2021 16:59:12 -0500
|
|
Subject: [PATCH 186/247] ASoC: atmel: fix shadowed variable
|
|
|
|
Fix cppcheck warning:
|
|
|
|
sound/soc/atmel/atmel-classd.c:51:14: style: Local variable 'pwm_type'
|
|
shadows outer variable [shadowVariable]
|
|
const char *pwm_type;
|
|
^
|
|
sound/soc/atmel/atmel-classd.c:226:27: note: Shadowed declaration
|
|
static const char * const pwm_type[] = {
|
|
^
|
|
sound/soc/atmel/atmel-classd.c:51:14: note: Shadow variable
|
|
const char *pwm_type;
|
|
^
|
|
|
|
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Reviewed-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
|
|
Link: https://lore.kernel.org/r/20210326215927.936377-3-pierre-louis.bossart@linux.intel.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
sound/soc/atmel/atmel-classd.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/sound/soc/atmel/atmel-classd.c
|
|
+++ b/sound/soc/atmel/atmel-classd.c
|
|
@@ -48,7 +48,7 @@ static struct atmel_classd_pdata *atmel_
|
|
{
|
|
struct device_node *np = dev->of_node;
|
|
struct atmel_classd_pdata *pdata;
|
|
- const char *pwm_type;
|
|
+ const char *pwm_type_s;
|
|
int ret;
|
|
|
|
if (!np) {
|
|
@@ -60,8 +60,8 @@ static struct atmel_classd_pdata *atmel_
|
|
if (!pdata)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
- ret = of_property_read_string(np, "atmel,pwm-type", &pwm_type);
|
|
- if ((ret == 0) && (strcmp(pwm_type, "diff") == 0))
|
|
+ ret = of_property_read_string(np, "atmel,pwm-type", &pwm_type_s);
|
|
+ if ((ret == 0) && (strcmp(pwm_type_s, "diff") == 0))
|
|
pdata->pwm_type = CLASSD_MR_PWMTYP_DIFF;
|
|
else
|
|
pdata->pwm_type = CLASSD_MR_PWMTYP_SINGLE;
|