mfd: remove unused variables

PATCH In review Arnd Bergmann 3 participants 4 messages Oct 7, 2015 – Oct 8, 2015 Multifunction devices (MFD)

Share & tools

Arnd Bergmann

author

2015-10-07 12:49 UTC #0 lore raw

PATCH 1/1 mfd: remove unused variables

A mass-cleanup by Javier Martinez Canillas removed a lot of unused code, but left at least two variables in mfd drivers in place that are now causing warnings:

drivers/mfd/rtsx_pcr.c: In function 'rtsx_pci_set_pull_ctl':
drivers/mfd/rtsx_pcr.c:564:6: warning: unused variable 'err' [-Wunused-variable] drivers/mfd/lm3533-core.c: In function 'lm3533_i2c_probe':
drivers/mfd/lm3533-core.c:595:6: warning: unused variable 'ret' [-Wunused-variable]

This removes them as well.

Signed-off-by Arnd Bergmann <[email protected]>

Fixes c749db571dc ("mfd: lm3533: Simplify function return logic")

Fixes a3c29b09982 ("mfd: rtsx: Simplify function return logic")

---

drivers/mfd/lm3533-core.c +0 -1

index 193ecee1fa7e..5abcbb2e8849 100644
@@ -592,7 +592,6 @@ static int lm3533_i2c_probe(struct i2c_client *i2c,
 					const struct i2c_device_id *id)
 {
 	struct lm3533 *lm3533;
-	int ret;
 
 	dev_dbg(&i2c->dev, "%s\n", __func__);

drivers/mfd/rtsx_pcr.c +0 -2

index b98cf1de0a55..d63f3a896adb 100644
@@ -561,8 +561,6 @@ EXPORT_SYMBOL_GPL(rtsx_pci_write_ppbuf);
 
 static int rtsx_pci_set_pull_ctl(struct rtsx_pcr *pcr, const u32 *tbl)
 {
-	int err;
-
 	rtsx_pci_init_cmd(pcr);
 
 	while (*tbl & 0xFFFF0000) {

Javier Martinez Canillas

Reviewed-by on v1 1/1

2015-10-07 13:03 UTC #1 lore raw

Hello Arnd,

Quoted 9 lines · Arnd Bergmann

A mass-cleanup by Javier Martinez Canillas removed a lot of unused code, but left at least two variables in mfd drivers in place that are now causing warnings:
drivers/mfd/rtsx_pcr.c: In function 'rtsx_pci_set_pull_ctl':
drivers/mfd/rtsx_pcr.c:564:6: warning: unused variable 'err' [-Wunused-variable] drivers/mfd/lm3533-core.c: In function 'lm3533_i2c_probe':
drivers/mfd/lm3533-core.c:595:6: warning: unused variable 'ret' [-Wunused-variable]

Quoted 6 lines

This removes them as well.
Signed-off-by Arnd Bergmann <[email protected]>
Fixes c749db571dc ("mfd: lm3533: Simplify function return logic")
Fixes a3c29b09982 ("mfd: rtsx: Simplify function return logic")
---

I thought that I got rid of all the unused variables but somehow I missed these. Sorry and thanks a lot for taking care of this.

Quoted 19 lines

drivers/mfd/lm3533-core.c +0 -1

index 193ecee1fa7e..5abcbb2e8849 100644
@@ -592,7 +592,6 @@ static int lm3533_i2c_probe(struct i2c_client *i2c,
 					const struct i2c_device_id *id)
 {
 	struct lm3533 *lm3533;
-	int ret;
 
 	dev_dbg(&i2c->dev, "%s\n", __func__);

drivers/mfd/rtsx_pcr.c +0 -0

index b98cf1de0a55..d63f3a896adb 100644

drivers/mfd/rtsx_pcr.c EXPORT_SYMBOL_GPL(rtsx_pci_write_ppbuf); · line 566

Quoted 8 lines

drivers/mfd/rtsx_pcr.c +0 -2

@@ -561,8 +561,6 @@ EXPORT_SYMBOL_GPL(rtsx_pci_write_ppbuf);
 
 static int rtsx_pci_set_pull_ctl(struct rtsx_pcr *pcr, const u32 *tbl)
 {
-	int err;
-
 	rtsx_pci_init_cmd(pcr);
 
 	while (*tbl & 0xFFFF0000) {

Patch looks good to me.

Reviewed-by Javier Martinez Canillas <[email protected]>

Best regards,

Signature · 3 lines

Javier Martinez Canillas
Open Source Group
Samsung Research America

Lee Jones

2015-10-08 07:23 UTC #2 lore raw

In reply to Arnd Bergmann

Quoted 9 lines · Arnd Bergmann

A mass-cleanup by Javier Martinez Canillas removed a lot of unused code, but left at least two variables in mfd drivers in place that are now causing warnings:
drivers/mfd/rtsx_pcr.c: In function 'rtsx_pci_set_pull_ctl':
drivers/mfd/rtsx_pcr.c:564:6: warning: unused variable 'err' [-Wunused-variable] drivers/mfd/lm3533-core.c: In function 'lm3533_i2c_probe':
drivers/mfd/lm3533-core.c:595:6: warning: unused variable 'ret' [-Wunused-variable]

Quoted 5 lines

This removes them as well.
Signed-off-by Arnd Bergmann <[email protected]>
Fixes c749db571dc ("mfd: lm3533: Simplify function return logic")
Fixes a3c29b09982 ("mfd: rtsx: Simplify function return logic")

Where's your diffstat?

Quoted 28 lines

---

drivers/mfd/lm3533-core.c +0 -1

index 193ecee1fa7e..5abcbb2e8849 100644
@@ -592,7 +592,6 @@ static int lm3533_i2c_probe(struct i2c_client *i2c,
 					const struct i2c_device_id *id)
 {
 	struct lm3533 *lm3533;
-	int ret;
 
 	dev_dbg(&i2c->dev, "%s\n", __func__);

drivers/mfd/rtsx_pcr.c +0 -2

index b98cf1de0a55..d63f3a896adb 100644
@@ -561,8 +561,6 @@ EXPORT_SYMBOL_GPL(rtsx_pci_write_ppbuf);
 
 static int rtsx_pci_set_pull_ctl(struct rtsx_pcr *pcr, const u32 *tbl)
 {
-	int err;
-
 	rtsx_pci_init_cmd(pcr);
 
 	while (*tbl & 0xFFFF0000) {

Signature · 4 lines

Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Lee Jones

2015-10-08 07:26 UTC #3 lore raw

Quoted 11 lines · Lee Jones

Quoted 9 lines · Arnd Bergmann
A mass-cleanup by Javier Martinez Canillas removed a lot of unused code, but left at least two variables in mfd drivers in place that are now causing warnings:
drivers/mfd/rtsx_pcr.c: In function 'rtsx_pci_set_pull_ctl':
drivers/mfd/rtsx_pcr.c:564:6: warning: unused variable 'err' [-Wunused-variable] drivers/mfd/lm3533-core.c: In function 'lm3533_i2c_probe':
drivers/mfd/lm3533-core.c:595:6: warning: unused variable 'ret' [-Wunused-variable]

Quoted 7 lines

Quoted 5 lines
This removes them as well.
Signed-off-by Arnd Bergmann <[email protected]>
Fixes c749db571dc ("mfd: lm3533: Simplify function return logic")
Fixes a3c29b09982 ("mfd: rtsx: Simplify function return logic")
Where's your diffstat?

By the way, someone sent a patch to fix these 20 mins before you did. :)

Quoted 29 lines

Quoted 28 lines

---

drivers/mfd/lm3533-core.c +0 -1

index 193ecee1fa7e..5abcbb2e8849 100644
@@ -592,7 +592,6 @@ static int lm3533_i2c_probe(struct i2c_client *i2c,
 					const struct i2c_device_id *id)
 {
 	struct lm3533 *lm3533;
-	int ret;
 
 	dev_dbg(&i2c->dev, "%s\n", __func__);

drivers/mfd/rtsx_pcr.c +0 -2

index b98cf1de0a55..d63f3a896adb 100644
@@ -561,8 +561,6 @@ EXPORT_SYMBOL_GPL(rtsx_pci_write_ppbuf);
 
 static int rtsx_pci_set_pull_ctl(struct rtsx_pcr *pcr, const u32 *tbl)
 {
-	int err;
-
 	rtsx_pci_init_cmd(pcr);
 
 	while (*tbl & 0xFFFF0000) {

Signature · 4 lines

Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog