| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253 |
- From 1b41c69264d7233a3e9a0aa36333ee22a5a049e9 Mon Sep 17 00:00:00 2001
- From: Pierre-Louis Bossart <[email protected]>
- 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 <[email protected]>
- Reviewed-by: Codrin Ciubotariu <[email protected]>
- Link: https://lore.kernel.org/r/[email protected]
- Signed-off-by: Mark Brown <[email protected]>
- ---
- sound/soc/atmel/atmel-classd.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
- diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
- index b1a28a9382fb..6023369e0f1a 100644
- --- a/sound/soc/atmel/atmel-classd.c
- +++ b/sound/soc/atmel/atmel-classd.c
- @@ -48,7 +48,7 @@ static struct atmel_classd_pdata *atmel_classd_dt_init(struct device *dev)
- {
- 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_classd_dt_init(struct device *dev)
- 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;
- --
- 2.32.0
|
