Commit 1b5188cd authored by Dingyan Li's avatar Dingyan Li Committed by Greg Kroah-Hartman
Browse files

usb: storage: use US_BULK_FLAG_OUT instead of constant values 



Macros with good names offer better readability.

Signed-off-by: default avatarDingyan Li <18500469033@163.com>
Link: https://lore.kernel.org/r/20241020072328.26401-1-18500469033@163.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fad16c82

drivers/usb/storage/ene_ub6250.c

+4 −4
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ static int sd_scsi_write(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  = 0x00;

	bcb->Flags  = US_BULK_FLAG_OUT;

	bcb->CDB[0] = 0xF0;

	bcb->CDB[5] = (unsigned char)(bnByte);

	bcb->CDB[4] = (unsigned char)(bnByte>>8);
@@ -1163,7 +1163,7 @@ static int ms_read_copyblock(struct us_data *us, u16 oldphy, u16 newphy, 
	memset(bcb, 0, sizeof(struct bulk_cb_wrap));

	bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);

	bcb->DataTransferLength = 0x200*len;

	bcb->Flags = 0x00;

	bcb->Flags = US_BULK_FLAG_OUT;

	bcb->CDB[0] = 0xF0;

	bcb->CDB[1] = 0x08;

	bcb->CDB[4] = (unsigned char)(oldphy);
@@ -1759,7 +1759,7 @@ static int ms_scsi_write(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  = 0x00;

		bcb->Flags  = US_BULK_FLAG_OUT;

		bcb->CDB[0] = 0xF0;

		bcb->CDB[1] = 0x04;

		bcb->CDB[5] = (unsigned char)(bn);
@@ -1931,7 +1931,7 @@ static int ene_load_bincode(struct us_data *us, unsigned char flag) 
	memset(bcb, 0, sizeof(struct bulk_cb_wrap));

	bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);

	bcb->DataTransferLength = sd_fw->size;

	bcb->Flags = 0x00;

	bcb->Flags = US_BULK_FLAG_OUT;

	bcb->CDB[0] = 0xEF;



	result = ene_send_scsi_cmd(us, FDIR_WRITE, buf, 0);

drivers/usb/storage/realtek_cr.c

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static int rts51x_bulk_transport(struct us_data *us, u8 lun, 
	/* set up the command wrapper */

	bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);

	bcb->DataTransferLength = cpu_to_le32(buf_len);

	bcb->Flags = (dir == DMA_FROM_DEVICE) ? US_BULK_FLAG_IN : 0;

	bcb->Flags = (dir == DMA_FROM_DEVICE) ? US_BULK_FLAG_IN : US_BULK_FLAG_OUT;

	bcb->Tag = ++us->tag;

	bcb->Lun = lun;

	bcb->Length = cmd_len;
@@ -301,7 +301,7 @@ static int rts51x_bulk_transport_special(struct us_data *us, u8 lun, 
	/* set up the command wrapper */

	bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);

	bcb->DataTransferLength = cpu_to_le32(buf_len);

	bcb->Flags = (dir == DMA_FROM_DEVICE) ? US_BULK_FLAG_IN : 0;

	bcb->Flags = (dir == DMA_FROM_DEVICE) ? US_BULK_FLAG_IN : US_BULK_FLAG_OUT;

	bcb->Tag = ++us->tag;

	bcb->Lun = lun;

	bcb->Length = cmd_len;

drivers/usb/storage/transport.c

+1 −1
Original line number Diff line number Diff line
@@ -1133,7 +1133,7 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us) 
	bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);

	bcb->DataTransferLength = cpu_to_le32(transfer_length);

	bcb->Flags = srb->sc_data_direction == DMA_FROM_DEVICE ?

		US_BULK_FLAG_IN : 0;

		US_BULK_FLAG_IN : US_BULK_FLAG_OUT;

	bcb->Tag = ++us->tag;

	bcb->Lun = srb->device->lun;

	if (us->fflags & US_FL_SCM_MULT_TARG)