On 22-08-19, 08:38, Pierre-Louis Bossart wrote: > 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@xxxxxxxxxxxxxxxx> > > Fixes: 085f4ace103d ("soundwire: intel: read mclk_freq property from firmware") > > Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx> > > This was fixed in the followup patch to disable hw links: > > - int nval, i; > + u32 quirk_mask; Well it is my mistake, the patch 085f4ace103d should not have kept it and I should have pointed it out in the review That would be the correct thing to do for a series. > which wasn't applied because debugsfs didn't apply, and debugfs didn't apply Changing after is not really desired. I understand that this goes away if that patch was merged but the point of a series is that we can find issues in patch N but still be able to apply patches N-1. > 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), > > -- ~Vinod _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx https://mailman.alsa-project.org/mailman/listinfo/alsa-devel