Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / drivers / usb / gadget / f_mass_storage.c

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index ee8ceec01560e5391a4f115c130002bd98917e41..a371e966425fce2ccf391e13d2d523f02bee52c3 100644 (file)
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003-2008 Alan Stern
  * Copyright (C) 2009 Samsung Electronics
- *                    Author: Michal Nazarewicz <m.nazarewicz@samsung.com>
+ *                    Author: Michal Nazarewicz <mina86@mina86.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -304,7 +304,6 @@
 
 static const char fsg_string_interface[] = "Mass Storage";
 
-#define FSG_NO_INTR_EP 1
 #define FSG_NO_DEVICE_STRINGS    1
 #define FSG_NO_OTG               1
 #define FSG_NO_INTR_EP           1
@@ -620,7 +619,7 @@ static int fsg_setup(struct usb_function *f,
 
        switch (ctrl->bRequest) {
 
-       case USB_BULK_RESET_REQUEST:
+       case US_BULK_RESET_REQUEST:
                if (ctrl->bRequestType !=
                    (USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE))
                        break;
@@ -636,7 +635,7 @@ static int fsg_setup(struct usb_function *f,
                raise_exception(fsg->common, FSG_STATE_RESET);
                return DELAYED_STATUS;
 
-       case USB_BULK_GET_MAX_LUN_REQUEST:
+       case US_BULK_GET_MAX_LUN:
                if (ctrl->bRequestType !=
                    (USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE))
                        break;
@@ -1742,7 +1741,7 @@ static int send_status(struct fsg_common *common)
        struct fsg_buffhd       *bh;
        struct bulk_cs_wrap     *csw;
        int                     rc;
-       u8                      status = USB_STATUS_PASS;
+       u8                      status = US_BULK_STAT_OK;
        u32                     sd, sdinfo = 0;
 
        /* Wait for the next buffer to become available */
@@ -1763,11 +1762,11 @@ static int send_status(struct fsg_common *common)
 
        if (common->phase_error) {
                DBG(common, "sending phase-error status\n");
-               status = USB_STATUS_PHASE_ERROR;
+               status = US_BULK_STAT_PHASE;
                sd = SS_INVALID_COMMAND;
        } else if (sd != SS_NO_SENSE) {
                DBG(common, "sending command-failure status\n");
-               status = USB_STATUS_FAIL;
+               status = US_BULK_STAT_FAIL;
                VDBG(common, "  sense data: SK x%02x, ASC x%02x, ASCQ x%02x;"
                                "  info x%x\n",
                                SK(sd), ASC(sd), ASCQ(sd), sdinfo);
@@ -1776,12 +1775,12 @@ static int send_status(struct fsg_common *common)
        /* Store and send the Bulk-only CSW */
        csw = (void *)bh->buf;
 
-       csw->Signature = cpu_to_le32(USB_BULK_CS_SIG);
+       csw->Signature = cpu_to_le32(US_BULK_CS_SIGN);
        csw->Tag = common->tag;
        csw->Residue = cpu_to_le32(common->residue);
        csw->Status = status;
 
-       bh->inreq->length = USB_BULK_CS_WRAP_LEN;
+       bh->inreq->length = US_BULK_CS_WRAP_LEN;
        bh->inreq->zero = 0;
        if (!start_in_transfer(common, bh))
                /* Don't know what to do if common->fsg is NULL */
@@ -2221,7 +2220,7 @@ unknown_cmnd:
 static int received_cbw(struct fsg_dev *fsg, struct fsg_buffhd *bh)
 {
        struct usb_request      *req = bh->outreq;
-       struct fsg_bulk_cb_wrap *cbw = req->buf;
+       struct bulk_cb_wrap     *cbw = req->buf;
        struct fsg_common       *common = fsg->common;
 
        /* Was this a real packet?  Should it be ignored? */
@@ -2229,9 +2228,9 @@ static int received_cbw(struct fsg_dev *fsg, struct fsg_buffhd *bh)
                return -EINVAL;
 
        /* Is the CBW valid? */
-       if (req->actual != USB_BULK_CB_WRAP_LEN ||
+       if (req->actual != US_BULK_CB_WRAP_LEN ||
                        cbw->Signature != cpu_to_le32(
-                               USB_BULK_CB_SIG)) {
+                               US_BULK_CB_SIGN)) {
                DBG(fsg, "invalid CBW: len %u sig 0x%x\n",
                                req->actual,
                                le32_to_cpu(cbw->Signature));
@@ -2253,7 +2252,7 @@ static int received_cbw(struct fsg_dev *fsg, struct fsg_buffhd *bh)
        }
 
        /* Is the CBW meaningful? */
-       if (cbw->Lun >= FSG_MAX_LUNS || cbw->Flags & ~USB_BULK_IN_FLAG ||
+       if (cbw->Lun >= FSG_MAX_LUNS || cbw->Flags & ~US_BULK_FLAG_IN ||
                        cbw->Length <= 0 || cbw->Length > MAX_COMMAND_SIZE) {
                DBG(fsg, "non-meaningful CBW: lun = %u, flags = 0x%x, "
                                "cmdlen %u\n",
@@ -2273,7 +2272,7 @@ static int received_cbw(struct fsg_dev *fsg, struct fsg_buffhd *bh)
        /* Save the command for later */
        common->cmnd_size = cbw->Length;
        memcpy(common->cmnd, cbw->CDB, common->cmnd_size);
-       if (cbw->Flags & USB_BULK_IN_FLAG)
+       if (cbw->Flags & US_BULK_FLAG_IN)
                common->data_dir = DATA_DIR_TO_HOST;
        else
                common->data_dir = DATA_DIR_FROM_HOST;
@@ -2303,7 +2302,7 @@ static int get_next_command(struct fsg_common *common)
        }
 
        /* Queue a request to read a Bulk-only CBW */
-       set_bulk_out_req_length(common, bh, USB_BULK_CB_WRAP_LEN);
+       set_bulk_out_req_length(common, bh, US_BULK_CB_WRAP_LEN);
        if (!start_out_transfer(common, bh))
                /* Don't know what to do if common->fsg is NULL */
                return -EIO;