[alsa-devel] [PATCH] soundwire: intel: remove unused variables

Pierre-Louis Bossart pierre-louis.bossart at linux.intel.com
Thu Aug 22 15:38:57 CEST 2019


On 8/22/19 1:25 AM, Vinod Koul wrote:
> Variables 'nval' and 'i' are no longer used sdw_master_read_intel_prop()
> so remove them.
> 
> drivers/soundwire/intel.c: In function 'sdw_master_read_intel_prop':
> drivers/soundwire/intel.c:829:12: warning: unused variable 'i' [-Wunused-variable]
>    int nval, i;
>              ^
> drivers/soundwire/intel.c:829:6: warning: unused variable 'nval' [-Wunused-variable]
>    int nval, i;
>        ^~~~
> 
> Reported-by: Stephen Rothwell <sfr at canb.auug.org.au>
> Fixes: 085f4ace103d ("soundwire: intel: read mclk_freq property from firmware")
> Signed-off-by: Vinod Koul <vkoul at kernel.org>

This was fixed in the followup patch to disable hw links:

-	int nval, i;
+	u32 quirk_mask;

which wasn't applied because debugsfs didn't apply, and debugfs didn't 
apply because of discrepancies between soundwire/fixes and soundwire/next...
I realize these variables were removed in the wrong patch but I would 
appreciate it if we could just avoid creating more conflicts for minor 
changes. Thank you.

> ---
>   drivers/soundwire/intel.c | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
> index 459cc1e6355d..cad378f741c0 100644
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@ -826,7 +826,6 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus)
>   	struct sdw_master_prop *prop = &bus->prop;
>   	struct fwnode_handle *link;
>   	char name[32];
> -	int nval, i;
>   
>   	/* Find master handle */
>   	snprintf(name, sizeof(name),
> 



More information about the Alsa-devel mailing list