Skip to contentSkip to conversation

usb: musb: remove unused variable 'devctl'

PATCH In review [email protected] 3 participants 5 messages Nov 24, 2020 – Dec 10, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 usb: musb: remove unused variable 'devctl'

From: Min Guo <[email protected]>

Remove unused 'devctl' variable to fix compile warnings:

drivers/usb/musb/musbhsdma.c: In function 'dma_controller_irq':
drivers/usb/musb/musbhsdma.c:324:8: warning: variable 'devctl' set but not used [-Wunused-but-set-variable]

---
changes in v3
suggested by Greg Kroah-Hartman:
Add a comment.

changes in v2
suggested by Alan Stern:
Add void before musb_read to indicate that the register MUSB_DEVCTL was intended to be read and discarded.

---
 drivers/usb/musb/musbhsdma.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/usb/musb/musbhsdma.c +5 -3
index 0aacfc8be5a1..2a345b4ad015 100644
@@ -321,8 +321,6 @@ irqreturn_t dma_controller_irq(int irq, void *private_data)
 				musb_channel->channel.status =
 					MUSB_DMA_STATUS_BUS_ABORT;
 			} else {
-				u8 devctl;
-
 				addr = musb_read_hsdma_addr(mbase,
 						bchannel);
 				channel->actual_len = addr
@@ -336,7 +334,11 @@ irqreturn_t dma_controller_irq(int irq, void *private_data)
 						< musb_channel->len) ?
 					"=> reconfig 0" : "=> complete");
 
-				devctl = musb_readb(mbase, MUSB_DEVCTL);
+				/*
+				 * Some hardware may need to read the
+				 * MUSB_DEVCTL register once to take effect.
+				 */
+				(void)musb_readb(mbase, MUSB_DEVCTL);
 
 				channel->status = MUSB_DMA_STATUS_FREE;
 
Signature · 1 line
2.18.0
#1 lore raw

Hello!

Quoted 26 lines · On 24.11.2020 11:49, [email protected] wrote:

From: Min Guo <[email protected]>

Remove unused 'devctl' variable to fix compile warnings:

drivers/usb/musb/musbhsdma.c: In function 'dma_controller_irq':
drivers/usb/musb/musbhsdma.c:324:8: warning: variable 'devctl' set but not used [-Wunused-but-set-variable]

---
changes in v3
suggested by Greg Kroah-Hartman:
Add a comment.

changes in v2
suggested by Alan Stern:
Add void before musb_read to indicate that the register MUSB_DEVCTL was intended to be read and discarded.

---
  drivers/usb/musb/musbhsdma.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
drivers/usb/musb/musbhsdma.c +0 -0
index 0aacfc8be5a1..2a345b4ad015 100644

[...]

drivers/usb/musb/musbhsdma.c irqreturn_t dma_controller_irq(int irq, void *private_data) · line 341

Quoted 10 lines
drivers/usb/musb/musbhsdma.c +5 -1
@@ -336,7 +334,11 @@ irqreturn_t dma_controller_irq(int irq, void *private_data)
  						< musb_channel->len) ?
  					"=> reconfig 0" : "=> complete");
 
-				devctl = musb_readb(mbase, MUSB_DEVCTL);
+				/*
+				 * Some hardware may need to read the
+				 * MUSB_DEVCTL register once to take effect.
+				 */
+				(void)musb_readb(mbase, MUSB_DEVCTL);

Hm, forcibly reading DevCtl in the DMA driver... sounds quite
nonsensically. Lemme take a look...

[...]

MBR, Sergei

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#2 lore raw

On 11/24/20 12:13 PM, Sergei Shtylyov wrote:

[...]

Quoted 27 lines
Quoted 26 lines

From: Min Guo <[email protected]>

Remove unused 'devctl' variable to fix compile warnings:

     drivers/usb/musb/musbhsdma.c: In function 'dma_controller_irq':
     drivers/usb/musb/musbhsdma.c:324:8: warning: variable 'devctl' set but not used [-Wunused-but-set-variable]

---
changes in v3
suggested by Greg Kroah-Hartman:
Add a comment.

changes in v2
suggested by Alan Stern:
Add void before musb_read to indicate that the register MUSB_DEVCTL was intended to be read and discarded.
---
  drivers/usb/musb/musbhsdma.c | 8 +++++---

  1 file changed, 5 insertions(+), 3 deletions(-)
drivers/usb/musb/musbhsdma.c +0 -0
index 0aacfc8be5a1..2a345b4ad015 100644

[...]

Quoted 11 lines
Quoted 9 lines
drivers/usb/musb/musbhsdma.c +0 -0
@@ -336,7 +334,11 @@ irqreturn_t dma_controller_irq(int irq, void *private_data)

                          < musb_channel->len) ? "=> reconfig 0" : "=> complete"); -                devctl = musb_readb(mbase, MUSB_DEVCTL); +                /*
+                 * Some hardware may need to read the +                 * MUSB_DEVCTL register once to take effect. +                 */
+                (void)musb_readb(mbase, MUSB_DEVCTL);

   Hm, forcibly reading DevCtl in the DMA driver... sounds quite nonsensically. Lemme take a look...

Indeed, prior to commit c418fd6c01fbc5516a2cd1eaf1df1ec86869028a ("usb: gadget: musb: fix short
isoc packets with inventra dma") the DevCtl read was done in order to check the DevCtl.HostMode bit -- this test was removed but the DevCtl read was left intact... so my vote goes for deleting both the read and the variable...

Quoted 1 line

[...]

MBR, Sergei

#3 lore raw
In reply to Sergei Shtylyov
Quoted 31 lines · Sergei Shtylyov

Hello!

Quoted 26 lines · On 24.11.2020 11:49, [email protected] wrote:

From: Min Guo <[email protected]>

Remove unused 'devctl' variable to fix compile warnings:

drivers/usb/musb/musbhsdma.c: In function 'dma_controller_irq':
drivers/usb/musb/musbhsdma.c:324:8: warning: variable 'devctl' set but not used [-Wunused-but-set-variable]

---
changes in v3
suggested by Greg Kroah-Hartman:
Add a comment.

changes in v2
suggested by Alan Stern:
Add void before musb_read to indicate that the register MUSB_DEVCTL was intended to be read and discarded.

---
  drivers/usb/musb/musbhsdma.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
drivers/usb/musb/musbhsdma.c +0 -0
index 0aacfc8be5a1..2a345b4ad015 100644

[...]

Quoted 12 lines

drivers/usb/musb/musbhsdma.c irqreturn_t dma_controller_irq(int irq, void *private_data) · line 340

Quoted 9 lines
drivers/usb/musb/musbhsdma.c +5 -1
@@ -336,7 +334,11 @@ irqreturn_t dma_controller_irq(int irq, void *private_data)
  						< musb_channel->len) ?
  					"=> reconfig 0" : "=> complete");
-				devctl = musb_readb(mbase, MUSB_DEVCTL);
+				/*
+				 * Some hardware may need to read the
+				 * MUSB_DEVCTL register once to take effect.
+				 */
+				(void)musb_readb(mbase, MUSB_DEVCTL);

Hm, forcibly reading DevCtl in the DMA driver... sounds quite
nonsensically. Lemme take a look...

What happened to your look?

thanks,

greg k-h

#4 lore raw

On 12/10/20 6:01 PM, Greg Kroah-Hartman wrote:

[...]

Quoted 40 lines
Quoted 27 lines
Quoted 26 lines

From: Min Guo <[email protected]>

Remove unused 'devctl' variable to fix compile warnings:

drivers/usb/musb/musbhsdma.c: In function 'dma_controller_irq':
drivers/usb/musb/musbhsdma.c:324:8: warning: variable 'devctl' set but not used [-Wunused-but-set-variable]

---
changes in v3
suggested by Greg Kroah-Hartman:
Add a comment.

changes in v2
suggested by Alan Stern:
Add void before musb_read to indicate that the register MUSB_DEVCTL was intended to be read and discarded.

---
  drivers/usb/musb/musbhsdma.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
drivers/usb/musb/musbhsdma.c +0 -0
index 0aacfc8be5a1..2a345b4ad015 100644

[...]

Quoted 12 lines

drivers/usb/musb/musbhsdma.c irqreturn_t dma_controller_irq(int irq, void *private_data) · line 340

Quoted 9 lines
drivers/usb/musb/musbhsdma.c +5 -1
@@ -336,7 +334,11 @@ irqreturn_t dma_controller_irq(int irq, void *private_data)
  						< musb_channel->len) ?
  					"=> reconfig 0" : "=> complete");
-				devctl = musb_readb(mbase, MUSB_DEVCTL);
+				/*
+				 * Some hardware may need to read the
+				 * MUSB_DEVCTL register once to take effect.
+				 */
+				(void)musb_readb(mbase, MUSB_DEVCTL);

Hm, forcibly reading DevCtl in the DMA driver... sounds quite
nonsensically. Lemme take a look...

Quoted 1 line

What happened to your look?

I thought I posted it the same day... Indeed, here it is, archived:

https://marc.info/?l=linux-usb&m=160621841910477

Quoted 3 lines

thanks,

greg k-h

MBR, Sergei

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek