Skip to contentSkip to conversation

usb: usbip: remove unnecessary cmd variable

PATCH In review Xiaobo Liu 2 participants 2 messages Jun 28, 2024

Subsystems (2)
USB USB over IP driver
lore
Share & tools
lore

Xiaobo Liu

author
#0 lore raw

PATCH 1/1 usb: usbip: remove unnecessary cmd variable

There are two redundant if conditions that can be simplified to directly use pdu->u.cmd_submit.

Signed-off-by Xiaobo Liu <[email protected]>
---
 drivers/usb/usbip/usbip_common.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/usb/usbip/usbip_common.c +1 -9
index a2b2da125..74a01a265 100644
@@ -568,17 +568,9 @@ static void correct_endian_ret_unlink(struct usbip_header_ret_unlink *pdu,
 
 void usbip_header_correct_endian(struct usbip_header *pdu, int send)
 {
-	__u32 cmd = 0;
-
-	if (send)
-		cmd = pdu->base.command;
-
 	correct_endian_basic(&pdu->base, send);
 
-	if (!send)
-		cmd = pdu->base.command;
-
-	switch (cmd) {
+	switch (pdu->base.command) {
 	case USBIP_CMD_SUBMIT:
 		correct_endian_cmd_submit(&pdu->u.cmd_submit, send);
 		break;
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 2 lines · Xiaobo Liu

There are two redundant if conditions that can be simplified to directly use pdu->u.cmd_submit.

I see you sent the same patch twice without indicating that it is a resend with a change in subject line.

How did you determine this change is necessary?

Quoted 10 lines
Signed-off-by Xiaobo Liu <[email protected]>
---
  drivers/usb/usbip/usbip_common.c | 10 +---------
  1 file changed, 1 insertion(+), 9 deletions(-)
drivers/usb/usbip/usbip_common.c +0 -0
index a2b2da125..74a01a265 100644

drivers/usb/usbip/usbip_common.c static void correct_endian_ret_unlink(struct usbip_header_ret_unlink *pdu, · line 571

Quoted 9 lines
drivers/usb/usbip/usbip_common.c +0 -5
@@ -568,17 +568,9 @@ static void correct_endian_ret_unlink(struct usbip_header_ret_unlink *pdu,
 
  void usbip_header_correct_endian(struct usbip_header *pdu, int send)
  {
-	__u32 cmd = 0;
-
-	if (send)
-		cmd = pdu->base.command;
-
  	correct_endian_basic(&pdu->base, send);

Did you check what correct_endian_basic() does and why it is important to check "send" and assign "cmd"

drivers/usb/usbip/usbip_common.c static void correct_endian_ret_unlink(struct usbip_header_ret_unlink *pdu, · line 579

Quoted 3 lines
drivers/usb/usbip/usbip_common.c +0 -2
-	if (!send)
-		cmd = pdu->base.command;

It is necessary to assign the command after calling

drivers/usb/usbip/usbip_common.c static void correct_endian_ret_unlink(struct usbip_header_ret_unlink *pdu, · line 576

Quoted 6 lines
drivers/usb/usbip/usbip_common.c +1 -2
-
-	switch (cmd) {
+	switch (pdu->base.command) {
  	case USBIP_CMD_SUBMIT:
  		correct_endian_cmd_submit(&pdu->u.cmd_submit, send);
  		break;

This patch will introduce an error. NAK on this patch.

thanks,
-- Shuah