Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / usb / storage / ene_ub6250.c

diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c
index a6ade4071a9a115c0cd316bd1779ab958523dac3..e7e678109500bd776e7d87ea27d16672166a0a9a 100644 (file)
--- a/drivers/usb/storage/ene_ub6250.c
+++ b/drivers/usb/storage/ene_ub6250.c
@@ -674,7 +674,7 @@ static int sd_scsi_read(struct us_data *us, struct scsi_cmnd *srb)
        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
        bcb->DataTransferLength = blenByte;
-       bcb->Flags  = 0x80;
+       bcb->Flags  = US_BULK_FLAG_IN;
        bcb->CDB[0] = 0xF1;
        bcb->CDB[5] = (unsigned char)(bnByte);
        bcb->CDB[4] = (unsigned char)(bnByte>>8);
@@ -858,7 +858,7 @@ static int ms_read_readpage(struct us_data *us, u32 PhyBlockAddr,
        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
        bcb->DataTransferLength = 0x200;
-       bcb->Flags      = 0x80;
+       bcb->Flags      = US_BULK_FLAG_IN;
        bcb->CDB[0]     = 0xF1;
 
        bcb->CDB[1]     = 0x02; /* in init.c ENE_MSInit() is 0x01 */
@@ -877,7 +877,7 @@ static int ms_read_readpage(struct us_data *us, u32 PhyBlockAddr,
        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
        bcb->DataTransferLength = 0x4;
-       bcb->Flags      = 0x80;
+       bcb->Flags      = US_BULK_FLAG_IN;
        bcb->CDB[0]     = 0xF1;
        bcb->CDB[1]     = 0x03;
 
@@ -1170,7 +1170,7 @@ static int ms_read_eraseblock(struct us_data *us, u32 PhyBlockAddr)
        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
        bcb->DataTransferLength = 0x200;
-       bcb->Flags = 0x80;
+       bcb->Flags = US_BULK_FLAG_IN;
        bcb->CDB[0] = 0xF2;
        bcb->CDB[1] = 0x06;
        bcb->CDB[4] = (unsigned char)(bn);
@@ -1249,7 +1249,7 @@ static int ms_lib_overwrite_extra(struct us_data *us, u32 PhyBlockAddr,
        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
        bcb->DataTransferLength = 0x4;
-       bcb->Flags = 0x80;
+       bcb->Flags = US_BULK_FLAG_IN;
        bcb->CDB[0] = 0xF2;
        bcb->CDB[1] = 0x05;
        bcb->CDB[5] = (unsigned char)(PageNum);
@@ -1331,7 +1331,7 @@ static int ms_lib_read_extra(struct us_data *us, u32 PhyBlock,
        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
        bcb->DataTransferLength = 0x4;
-       bcb->Flags      = 0x80;
+       bcb->Flags      = US_BULK_FLAG_IN;
        bcb->CDB[0]     = 0xF1;
        bcb->CDB[1]     = 0x03;
        bcb->CDB[5]     = (unsigned char)(PageNum);
@@ -1533,7 +1533,7 @@ static int ms_lib_read_extrablock(struct us_data *us, u32 PhyBlock,
        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
        bcb->DataTransferLength = 0x4 * blen;
-       bcb->Flags      = 0x80;
+       bcb->Flags      = US_BULK_FLAG_IN;
        bcb->CDB[0]     = 0xF1;
        bcb->CDB[1]     = 0x03;
        bcb->CDB[5]     = (unsigned char)(PageNum);
@@ -1650,7 +1650,7 @@ static int ms_scsi_read(struct us_data *us, struct scsi_cmnd *srb)
                memset(bcb, 0, sizeof(struct bulk_cb_wrap));
                bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
                bcb->DataTransferLength = blenByte;
-               bcb->Flags  = 0x80;
+               bcb->Flags  = US_BULK_FLAG_IN;
                bcb->CDB[0] = 0xF1;
                bcb->CDB[1] = 0x02;
                bcb->CDB[5] = (unsigned char)(bn);
@@ -1694,7 +1694,7 @@ static int ms_scsi_read(struct us_data *us, struct scsi_cmnd *srb)
                        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
                        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
                        bcb->DataTransferLength = 0x200 * len;
-                       bcb->Flags  = 0x80;
+                       bcb->Flags  = US_BULK_FLAG_IN;
                        bcb->CDB[0] = 0xF1;
                        bcb->CDB[1] = 0x02;
                        bcb->CDB[5] = (unsigned char)(blkno);
@@ -1827,7 +1827,7 @@ static int ene_get_card_type(struct us_data *us, u16 index, void *buf)
        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
        bcb->DataTransferLength = 0x01;
-       bcb->Flags                      = 0x80;
+       bcb->Flags                      = US_BULK_FLAG_IN;
        bcb->CDB[0]                     = 0xED;
        bcb->CDB[2]                     = (unsigned char)(index>>8);
        bcb->CDB[3]                     = (unsigned char)index;
@@ -2083,7 +2083,7 @@ static int ene_ms_init(struct us_data *us)
        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
        bcb->DataTransferLength = 0x200;
-       bcb->Flags      = 0x80;
+       bcb->Flags      = US_BULK_FLAG_IN;
        bcb->CDB[0]     = 0xF1;
        bcb->CDB[1]     = 0x01;
 
@@ -2134,7 +2134,7 @@ static int ene_sd_init(struct us_data *us)
 
        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
-       bcb->Flags = 0x80;
+       bcb->Flags = US_BULK_FLAG_IN;
        bcb->CDB[0] = 0xF2;
 
        result = ene_send_scsi_cmd(us, FDIR_READ, NULL, 0);
@@ -2153,7 +2153,7 @@ static int ene_sd_init(struct us_data *us)
        memset(bcb, 0, sizeof(struct bulk_cb_wrap));
        bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
        bcb->DataTransferLength = 0x200;
-       bcb->Flags              = 0x80;
+       bcb->Flags              = US_BULK_FLAG_IN;
        bcb->CDB[0]             = 0xF1;
 
        result = ene_send_scsi_cmd(us, FDIR_READ, &buf, 0);
@@ -2407,6 +2407,7 @@ static struct usb_driver ene_ub6250_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     ene_ub6250_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(ene_ub6250_driver);