fhci-hub: kill 'len' variable in fhci_hub_control()

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / fhci-hub.c

diff --git a/drivers/usb/host/fhci-hub.c b/drivers/usb/host/fhci-hub.c
index 6af2512f8378ab7039f9f4d652177ea1380dca38..a081a780874d8a9895ba118396d575384a5068d3 100644 (file)
--- a/drivers/usb/host/fhci-hub.c
+++ b/drivers/usb/host/fhci-hub.c
@@ -32,8 +32,8 @@ static u8 root_hub_des[] = {
        0x09, /* blength */
        0x29, /* bDescriptorType;hub-descriptor */
        0x01, /* bNbrPorts */
-       0x00, /* wHubCharacteristics */
-       0x00,
+       0x11, /* wHubCharacteristics */
+       0x00, /* per-port power, no overcurrent */
        0x01, /* bPwrOn2pwrGood;2ms */
        0x00, /* bHubContrCurrent;0mA */
        0x00, /* DeviceRemoveable */
@@ -208,7 +208,6 @@ int fhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
 {
        struct fhci_hcd *fhci = hcd_to_fhci(hcd);
        int retval = 0;
-       int len = 0;
        struct usb_hub_status *hub_status;
        struct usb_port_status *port_status;
        unsigned long flags;
@@ -272,8 +271,6 @@ int fhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                break;
        case GetHubDescriptor:
                memcpy(buf, root_hub_des, sizeof(root_hub_des));
-               buf[3] = 0x11; /* per-port power, no ovrcrnt */
-               len = (buf[0] < wLength) ? buf[0] : wLength;
                break;
        case GetHubStatus:
                hub_status = (struct usb_hub_status *)buf;
@@ -281,7 +278,6 @@ int fhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                    cpu_to_le16(fhci->vroot_hub->hub.wHubStatus);
                hub_status->wHubChange =
                    cpu_to_le16(fhci->vroot_hub->hub.wHubChange);
-               len = 4;
                break;
        case GetPortStatus:
                port_status = (struct usb_port_status *)buf;
@@ -289,7 +285,6 @@ int fhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                    cpu_to_le16(fhci->vroot_hub->port.wPortStatus);
                port_status->wPortChange =
                    cpu_to_le16(fhci->vroot_hub->port.wPortChange);
-               len = 4;
                break;
        case SetHubFeature:
                switch (wValue) {