Skip to contentSkip to conversation

usb:udc:samsung:fix Remove the req_config flag

PATCH New Lukasz Majewski 2 participants 2 messages Mar 13, 2012 – Mar 14, 2012 USB

lore
Share & tools
lore

Lukasz Majewski

author
#0 lore raw

PATCH 1/1 usb:udc:samsung:fix Remove the req_config flag

The dev->req_config flag was indicating that the forwarded request needs to perform the usb gadget delayed status. This is however not needed anymore, so it can be removed.

Signed-off-by Lukasz Majewski <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
Cc Marek Vasut <[email protected]>
---
 drivers/usb/gadget/s3c_udc_otg_xfer_dma.c |   18 +++++-------------
 include/usb/s3c_udc.h                     |    2 +-
 2 files changed, 6 insertions(+), 14 deletions(-)
drivers/usb/gadget/s3c_udc_otg_xfer_dma.c +5 -13
index b11108d..afd4931 100644
@@ -1316,7 +1316,7 @@ void s3c_ep0_setup(struct s3c_udc *dev)
 	/* cope with automagic for some standard requests. */
 	dev->req_std = (usb_ctrl->bRequestType & USB_TYPE_MASK)
 		== USB_TYPE_STANDARD;
-	dev->req_config = 0;
+
 	dev->req_pending = 1;
 
 	/* Handle some SETUP packets ourselves */

@@ -1337,10 +1337,9 @@ void s3c_ep0_setup(struct s3c_udc *dev)
 			DEBUG_SETUP("%s: USB_REQ_SET_CONFIGURATION (%d)\n",
 					__func__, usb_ctrl->wValue);
 
-			if (usb_ctrl->bRequestType == USB_RECIP_DEVICE) {
+			if (usb_ctrl->bRequestType == USB_RECIP_DEVICE)
 				reset_available = 1;
-				dev->req_config = 1;
-			}
+
 			break;
 
 		case USB_REQ_GET_DESCRIPTOR:

@@ -1352,10 +1351,9 @@ void s3c_ep0_setup(struct s3c_udc *dev)
 			DEBUG_SETUP("%s: *** USB_REQ_SET_INTERFACE (%d)\n",
 					__func__, usb_ctrl->wValue);
 
-			if (usb_ctrl->bRequestType == USB_RECIP_INTERFACE) {
+			if (usb_ctrl->bRequestType == USB_RECIP_INTERFACE)
 				reset_available = 1;
-				dev->req_config = 1;
-			}
+
 			break;
 
 		case USB_REQ_GET_CONFIGURATION:

@@ -1404,12 +1402,6 @@ void s3c_ep0_setup(struct s3c_udc *dev)
 		spin_lock(&dev->lock);
 
 		if (i < 0) {
-			if (dev->req_config) {
-				DEBUG_SETUP("\tconfig change 0x%02x fail %d?\n",
-					(u32)usb_ctrl->bRequest, i);
-				return;
-			}
-
 			/* setup processing failed, force stall */
 			s3c_udc_ep0_set_stall(ep);
 			dev->ep0state = WAIT_FOR_SETUP;
include/usb/s3c_udc.h +1 -1
index 31d8f6c..6c973b6 100644
@@ -102,7 +102,7 @@ struct s3c_udc {
 
 	unsigned char usb_address;
 
-	unsigned req_pending:1, req_std:1, req_config:1;
+	unsigned req_pending:1, req_std:1;
 };
 
 extern struct s3c_udc *the_controller;
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 1/1 usb:udc:samsung:fix Remove the req_config flag

Dear Lukasz Majewski,

Quoted 3 lines

The dev->req_config flag was indicating that the forwarded request needs to perform the usb gadget delayed status. This is however not needed anymore, so it can be removed.

You're the expert, but why is it not needed anymore ? :) Otherwise I'm all right with the patch.

Quoted 4 lines
Signed-off-by Lukasz Majewski <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
Cc Marek Vasut <[email protected]>

Best regards,
Marek Vasut