Merge tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / usb / wusbcore / cbaf.c

diff --git a/drivers/usb/wusbcore/cbaf.c b/drivers/usb/wusbcore/cbaf.c
index f06ed82..da1b872 100644 (file)
--- a/drivers/usb/wusbcore/cbaf.c
+++ b/drivers/usb/wusbcore/cbaf.c
@@ -144,7 +144,7 @@ static int cbaf_check(struct cbaf *cbaf)
                CBAF_REQ_GET_ASSOCIATION_INFORMATION,
                USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
                0, cbaf->usb_iface->cur_altsetting->desc.bInterfaceNumber,
-               cbaf->buffer, cbaf->buffer_size, 1000 /* FIXME: arbitrary */);
+               cbaf->buffer, cbaf->buffer_size, USB_CTRL_GET_TIMEOUT);
        if (result < 0) {
                dev_err(dev, "Cannot get available association types: %d\n",
                        result);
@@ -184,7 +184,7 @@ static int cbaf_check(struct cbaf *cbaf)
                assoc_request = itr;
 
                if (top - itr < sizeof(*assoc_request)) {
-                       dev_err(dev, "Not enough data to decode associaton "
+                       dev_err(dev, "Not enough data to decode association "
                                "request (%zu vs %zu bytes needed)\n",
                                top - itr, sizeof(*assoc_request));
                        break;
@@ -235,7 +235,7 @@ static int cbaf_check(struct cbaf *cbaf)
 
 static const struct wusb_cbaf_host_info cbaf_host_info_defaults = {
        .AssociationTypeId_hdr    = WUSB_AR_AssociationTypeId,
-       .AssociationTypeId        = cpu_to_le16(AR_TYPE_WUSB),
+       .AssociationTypeId        = cpu_to_le16(AR_TYPE_WUSB),
        .AssociationSubTypeId_hdr = WUSB_AR_AssociationSubTypeId,
        .AssociationSubTypeId = cpu_to_le16(AR_TYPE_WUSB_RETRIEVE_HOST_INFO),
        .CHID_hdr                 = WUSB_AR_CHID,
@@ -260,12 +260,13 @@ static int cbaf_send_host_info(struct cbaf *cbaf)
        hi->HostFriendlyName_hdr.len = cpu_to_le16(name_len);
        hi_size = sizeof(*hi) + name_len;
 
-       return usb_control_msg(cbaf->usb_dev, usb_sndctrlpipe(cbaf->usb_dev, 0),
+       return usb_control_msg(cbaf->usb_dev,
+                       usb_sndctrlpipe(cbaf->usb_dev, 0),
                        CBAF_REQ_SET_ASSOCIATION_RESPONSE,
                        USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
                        0x0101,
                        cbaf->usb_iface->cur_altsetting->desc.bInterfaceNumber,
-                       hi, hi_size, 1000 /* FIXME: arbitrary */);
+                       hi, hi_size, USB_CTRL_SET_TIMEOUT);
 }
 
 /*
@@ -288,9 +289,10 @@ static int cbaf_cdid_get(struct cbaf *cbaf)
                CBAF_REQ_GET_ASSOCIATION_REQUEST,
                USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
                0x0200, cbaf->usb_iface->cur_altsetting->desc.bInterfaceNumber,
-               di, cbaf->buffer_size, 1000 /* FIXME: arbitrary */);
+               di, cbaf->buffer_size, USB_CTRL_GET_TIMEOUT);
        if (result < 0) {
-               dev_err(dev, "Cannot request device information: %d\n", result);
+               dev_err(dev, "Cannot request device information: %d\n",
+                       result);
                return result;
        }
 
@@ -491,11 +493,11 @@ static DEVICE_ATTR(wusb_device_name, 0600, cbaf_wusb_device_name_show, NULL);
 
 static const struct wusb_cbaf_cc_data cbaf_cc_data_defaults = {
        .AssociationTypeId_hdr    = WUSB_AR_AssociationTypeId,
-       .AssociationTypeId        = cpu_to_le16(AR_TYPE_WUSB),
+       .AssociationTypeId        = cpu_to_le16(AR_TYPE_WUSB),
        .AssociationSubTypeId_hdr = WUSB_AR_AssociationSubTypeId,
        .AssociationSubTypeId     = cpu_to_le16(AR_TYPE_WUSB_ASSOCIATE),
        .Length_hdr               = WUSB_AR_Length,
-       .Length                   = cpu_to_le32(sizeof(struct wusb_cbaf_cc_data)),
+       .Length         = cpu_to_le32(sizeof(struct wusb_cbaf_cc_data)),
        .ConnectionContext_hdr    = WUSB_AR_ConnectionContext,
        .BandGroups_hdr           = WUSB_AR_BandGroups,
 };
@@ -536,7 +538,7 @@ static int cbaf_cc_upload(struct cbaf *cbaf)
                CBAF_REQ_SET_ASSOCIATION_RESPONSE,
                USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
                0x0201, cbaf->usb_iface->cur_altsetting->desc.bInterfaceNumber,
-               ccd, sizeof(*ccd), 1000 /* FIXME: arbitrary */);
+               ccd, sizeof(*ccd), USB_CTRL_SET_TIMEOUT);
 
        return result;
 }