[PATCH 16/26] usb: storage: Drop unused fields in struct us_data

[Andrey Smirnov]

Only bulk-only transport is supported by the currennt codebase, so
ep_bInterval and recv_intr_ep are not really used. Remove them and all
related code. While at it remove flags and subclass as well since they
are not really used anywhere in the codebase.

Signed-off-by: Andrey Smirnov <andrew.smir...@gmail.com>
---
 drivers/usb/storage/usb.c | 14 ++------------
 drivers/usb/storage/usb.h |  4 ----
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 849bce510..c04a202bb 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -433,7 +433,6 @@ static int get_pipes(struct us_data *us, struct 
usb_interface *intf)
        struct usb_endpoint_descriptor *ep;
        struct usb_endpoint_descriptor *ep_in = NULL;
        struct usb_endpoint_descriptor *ep_out = NULL;
-       struct usb_endpoint_descriptor *ep_int = NULL;
 
        /*
         * Find the first endpoint of each type we need.
@@ -454,12 +453,8 @@ static int get_pipes(struct us_data *us, struct 
usb_interface *intf)
                                        ep_out = ep;
                        }
                }
-               else if (USB_EP_IS_INT_IN(ep)) {
-                       if (!ep_int)
-                               ep_int = ep;
-               }
        }
-       if (!ep_in || !ep_out || (us->protocol == US_PR_CBI && !ep_int)) {
+       if (!ep_in || !ep_out || us->protocol == US_PR_CBI) {
                dev_dbg(dev, "Endpoint sanity check failed! Rejecting dev.\n");
                return -EIO;
        }
@@ -467,10 +462,7 @@ static int get_pipes(struct us_data *us, struct 
usb_interface *intf)
        /* Store the pipe values */
        us->send_bulk_ep = USB_EP_NUM(ep_out);
        us->recv_bulk_ep = USB_EP_NUM(ep_in);
-       if (ep_int) {
-               us->recv_intr_ep = USB_EP_NUM(ep_int);
-               us->ep_bInterval = ep_int->bInterval;
-       }
+
        return 0;
 }
 
@@ -533,9 +525,7 @@ static int usb_stor_probe(struct usb_device *usbdev,
 
        /* initialize the us_data structure */
        us->pusb_dev = usbdev;
-       us->flags = 0;
        us->ifnum = intf->desc.bInterfaceNumber;
-       us->subclass = intf->desc.bInterfaceSubClass;
        us->protocol = intf->desc.bInterfaceProtocol;
        INIT_LIST_HEAD(&us->blk_dev_list);
 
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index 3aff15da2..cd4904f03 100644
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -54,17 +54,13 @@ typedef int (*trans_reset)(struct us_data *data);
 /* one us_data object allocated per usb storage device */
 struct us_data {
        struct usb_device       *pusb_dev;      /* this usb_device */
-       unsigned int            flags;          /* from filter */
        unsigned char           send_bulk_ep;   /* used endpoints */
        unsigned char           recv_bulk_ep;
-       unsigned char           recv_intr_ep;
        unsigned char           ifnum;          /* interface number */
 
-       unsigned char           subclass;
        unsigned char           protocol;
 
        unsigned char           max_lun;
-       unsigned char           ep_bInterval;
 
        char                    *transport_name;
 
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox