Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[platform/kernel/u-boot.git] / common / usb_storage.c

diff --git a/common/usb_storage.c b/common/usb_storage.c
index 3e113b4..94f659f 100644 (file)
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -55,13 +55,9 @@
 #include <asm/byteorder.h>
 #include <asm/processor.h>
 
-
-#if defined(CONFIG_CMD_USB)
 #include <part.h>
 #include <usb.h>
 
-#ifdef CONFIG_USB_STORAGE
-
 #undef USB_STOR_DEBUG
 #undef BBB_COMDAT_TRACE
 #undef BBB_XPORT_TRACE
@@ -731,7 +727,7 @@ int usb_stor_CB_transport(ccb *srb, struct us_data *us)
        ccb reqsrb;
        int retry,notready;
 
-       psrb=&reqsrb;
+       psrb = &reqsrb;
        status=USB_STOR_TRANSPORT_GOOD;
        retry=0;
        notready=0;
@@ -776,7 +772,7 @@ do_retry:
        psrb->cmd[1]=srb->lun<<5;
        psrb->cmd[4]=18;
        psrb->datalen=18;
-       psrb->pdata=&srb->sense_buf[0];
+       psrb->pdata = &srb->sense_buf[0];
        psrb->cmdlen=12;
        /* issue the command */
        result=usb_stor_CB_comdat(psrb,us);
@@ -858,7 +854,7 @@ static int usb_request_sense(ccb *srb,struct us_data *ss)
        srb->cmd[1]=srb->lun<<5;
        srb->cmd[4]=18;
        srb->datalen=18;
-       srb->pdata=&srb->sense_buf[0];
+       srb->pdata = &srb->sense_buf[0];
        srb->cmdlen=12;
        ss->transport(srb,ss);
        USB_STOR_PRINTF("Request Sense returned %02X %02X %02X\n",srb->sense_buf[2],srb->sense_buf[12],srb->sense_buf[13]);
@@ -1242,6 +1238,3 @@ int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t
        USB_STOR_PRINTF("partype: %d\n",dev_desc->part_type);
        return 1;
 }
-
-#endif /* CONFIG_USB_STORAGE */
-#endif