Skip to contentSkip to conversation

soundwire: intel: remove unused variables

PATCH In review Vinod Koul 2 participants 3 messages Aug 22, 2019 – Aug 23, 2019 SoundWire

lore
Share & tools
lore

Vinod Koul

author maintainer
#0 lore raw

PATCH 1/1 soundwire: intel: remove unused variables

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;
      ^~~~
Fixes 085f4ace103d ("soundwire: intel: read mclk_freq property from firmware")
---
 drivers/soundwire/intel.c | 1 -
 1 file changed, 1 deletion(-)
drivers/soundwire/intel.c +0 -1
index 459cc1e6355d..cad378f741c0 100644
@@ -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),
Signature · 1 line
2.20.1
#1 lore raw
Quoted 11 lines · Vinod Koul

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;
       ^~~~
Quoted 3 lines
Fixes 085f4ace103d ("soundwire: intel: read mclk_freq property from firmware")

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.

Quoted 17 lines
---
  drivers/soundwire/intel.c | 1 -
  1 file changed, 1 deletion(-)
drivers/soundwire/intel.c +0 -1
index 459cc1e6355d..cad378f741c0 100644
@@ -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),
author maintainer
#2 lore raw
Quoted 18 lines · Pierre-Louis Bossart
Quoted 11 lines · Vinod Koul

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;
       ^~~~
Quoted 3 lines
Fixes 085f4ace103d ("soundwire: intel: read mclk_freq property from firmware")

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

Review

Quoted 2 lines
(quoted diff) +1 -1
-	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.

Quoted 1 line

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.

Quoted 21 lines

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.

Quoted 16 lines
---
  drivers/soundwire/intel.c | 1 -
  1 file changed, 1 deletion(-)
drivers/soundwire/intel.c +0 -1
index 459cc1e6355d..cad378f741c0 100644
@@ -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),
 
Signature · 1 line
~Vinod