usb: use unaligned endian helpers in storage drivers
Subsystems (2)
Signed-off-by Harvey Harrison <[email protected]>
---
Depends on the unaligned access work in -mm.
drivers/usb/storage/datafab.c | 32 +++++++++--------------------- drivers/usb/storage/jumpshot.c | 32 +++++++++--------------------- drivers/usb/storage/shuttle_usbat.c | 36 ++++++++++------------------------ 3 files changed, 31 insertions(+), 69 deletions(-)
drivers/usb/storage/datafab.c +10 -22
@@ -50,6 +50,7 @@#include <linux/errno.h> #include <linux/slab.h> +#include <asm/unaligned.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h>
@@ -373,10 +374,7 @@ static int datafab_id_device(struct us_data *us,if (rc ==USB_STOR_XFER_GOOD ) {// capacity is at word offset 57-58 // - info->sectors = ((u32)(reply[117 ]) <<24 ) | - ((u32)(reply[116 ]) <<16 ) | - ((u32)(reply[115 ]) <<8 ) | - ((u32)(reply[114 ]) ); + info->sectors =load_le32_noalign ((__le32 *)&reply[114 ]); rc =USB_STOR_TRANSPORT_GOOD ; goto leave; }
@@ -556,10 +554,8 @@ int datafab_transport(struct scsi_cmnd * srb, struct us_data *us)// don't bother implementing READ_6 or WRITE_6. // if (srb->cmnd[0 ] ==READ_10 ) { - block = ((u32)(srb->cmnd[2 ]) <<24 ) | ((u32)(srb->cmnd[3 ]) <<16 ) | - ((u32)(srb->cmnd[4 ]) <<8 ) | ((u32)(srb->cmnd[5 ])); - - blocks = ((u32)(srb->cmnd[7 ]) <<8 ) | ((u32)(srb->cmnd[8 ])); + block =load_be32_noalign ((__be32 *)&srb->cmnd[2 ]); + blocks =load_be16_noalign ((__be16 *)&srb->cmnd[7 ]);US_DEBUGP ("datafab_transport: READ_10: read block 0x%04lx count %ld\n" , block, blocks);return datafab_read_data (us, info, block, blocks);
@@ -568,21 +564,16 @@ int datafab_transport(struct scsi_cmnd * srb, struct us_data *us)if (srb->cmnd[0 ] ==READ_12 ) {// we'll probably never see a READ_12 but we'll do it anyway... // - block = ((u32)(srb->cmnd[2 ]) <<24 ) | ((u32)(srb->cmnd[3 ]) <<16 ) | - ((u32)(srb->cmnd[4 ]) <<8 ) | ((u32)(srb->cmnd[5 ])); - - blocks = ((u32)(srb->cmnd[6 ]) <<24 ) | ((u32)(srb->cmnd[7 ]) <<16 ) | - ((u32)(srb->cmnd[8 ]) <<8 ) | ((u32)(srb->cmnd[9 ])); + block =load_be32_noalign ((__be32 *)&srb->cmnd[2 ]); + blocks =load_be32_noalign ((__be32 *)&srb->cmnd[6 ]);US_DEBUGP ("datafab_transport: READ_12: read block 0x%04lx count %ld\n" , block, blocks);return datafab_read_data (us, info, block, blocks); }if (srb->cmnd[0 ] ==WRITE_10 ) { - block = ((u32)(srb->cmnd[2 ]) <<24 ) | ((u32)(srb->cmnd[3 ]) <<16 ) | - ((u32)(srb->cmnd[4 ]) <<8 ) | ((u32)(srb->cmnd[5 ])); - - blocks = ((u32)(srb->cmnd[7 ]) <<8 ) | ((u32)(srb->cmnd[8 ])); + block =load_be32_noalign ((__be32 *)&srb->cmnd[2 ]); + blocks =load_be16_noalign ((__be16 *)&srb->cmnd[7 ]);US_DEBUGP ("datafab_transport: WRITE_10: write block 0x%04lx count %ld\n" , block, blocks);return datafab_write_data (us, info, block, blocks);
@@ -591,11 +582,8 @@ int datafab_transport(struct scsi_cmnd * srb, struct us_data *us)if (srb->cmnd[0 ] ==WRITE_12 ) {// we'll probably never see a WRITE_12 but we'll do it anyway... // - block = ((u32)(srb->cmnd[2 ]) <<24 ) | ((u32)(srb->cmnd[3 ]) <<16 ) | - ((u32)(srb->cmnd[4 ]) <<8 ) | ((u32)(srb->cmnd[5 ])); - - blocks = ((u32)(srb->cmnd[6 ]) <<24 ) | ((u32)(srb->cmnd[7 ]) <<16 ) | - ((u32)(srb->cmnd[8 ]) <<8 ) | ((u32)(srb->cmnd[9 ])); + block =load_be32_noalign ((__be32 *)&srb->cmnd[2 ]); + blocks =load_be32_noalign ((__be32 *)&srb->cmnd[6 ]);US_DEBUGP ("datafab_transport: WRITE_12: write block 0x%04lx count %ld\n" , block, blocks);return datafab_write_data (us, info, block, blocks);
drivers/usb/storage/jumpshot.c +10 -22
@@ -47,6 +47,7 @@#include <linux/errno.h> #include <linux/slab.h> +#include <asm/unaligned.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h>
@@ -309,10 +310,7 @@ static int jumpshot_id_device(struct us_data *us, goto leave; } - info->sectors = ((u32)(reply[117 ]) <<24 ) | - ((u32)(reply[116 ]) <<16 ) | - ((u32)(reply[115 ]) <<8 ) | - ((u32)(reply[114 ]) ); + info->sectors =load_le32_noalign ((__le32 *)&reply[114 ]); rc =USB_STOR_TRANSPORT_GOOD ;
@@ -486,10 +484,8 @@ int jumpshot_transport(struct scsi_cmnd * srb, struct us_data *us) }if (srb->cmnd[0 ] ==READ_10 ) { - block = ((u32)(srb->cmnd[2 ]) <<24 ) | ((u32)(srb->cmnd[3 ]) <<16 ) | - ((u32)(srb->cmnd[4 ]) <<8 ) | ((u32)(srb->cmnd[5 ])); - - blocks = ((u32)(srb->cmnd[7 ]) <<8 ) | ((u32)(srb->cmnd[8 ])); + block =load_be32_noalign ((__be32 *)&srb->cmnd[2 ]); + blocks =load_be16_noalign ((__be16 *)&srb->cmnd[7 ]);US_DEBUGP ("jumpshot_transport: READ_10: read block 0x%04lx count %ld\n" , block, blocks);return jumpshot_read_data (us, info, block, blocks);
@@ -498,21 +494,16 @@ int jumpshot_transport(struct scsi_cmnd * srb, struct us_data *us)if (srb->cmnd[0 ] ==READ_12 ) {// I don't think we'll ever see a READ_12 but support it anyway... // - block = ((u32)(srb->cmnd[2 ]) <<24 ) | ((u32)(srb->cmnd[3 ]) <<16 ) | - ((u32)(srb->cmnd[4 ]) <<8 ) | ((u32)(srb->cmnd[5 ])); - - blocks = ((u32)(srb->cmnd[6 ]) <<24 ) | ((u32)(srb->cmnd[7 ]) <<16 ) | - ((u32)(srb->cmnd[8 ]) <<8 ) | ((u32)(srb->cmnd[9 ])); + block =load_be32_noalign ((__be32 *)&srb->cmnd[2 ]); + blocks =load_be32_noalign ((__be32 *)&srb->cmnd[6 ]);US_DEBUGP ("jumpshot_transport: READ_12: read block 0x%04lx count %ld\n" , block, blocks);return jumpshot_read_data (us, info, block, blocks); }if (srb->cmnd[0 ] ==WRITE_10 ) { - block = ((u32)(srb->cmnd[2 ]) <<24 ) | ((u32)(srb->cmnd[3 ]) <<16 ) | - ((u32)(srb->cmnd[4 ]) <<8 ) | ((u32)(srb->cmnd[5 ])); - - blocks = ((u32)(srb->cmnd[7 ]) <<8 ) | ((u32)(srb->cmnd[8 ])); + block =load_be32_noalign ((__be32 *)&srb->cmnd[2 ]); + blocks =load_be16_noalign ((__be16 *)&srb->cmnd[7 ]);US_DEBUGP ("jumpshot_transport: WRITE_10: write block 0x%04lx count %ld\n" , block, blocks);return jumpshot_write_data (us, info, block, blocks);
@@ -521,11 +512,8 @@ int jumpshot_transport(struct scsi_cmnd * srb, struct us_data *us)if (srb->cmnd[0 ] ==WRITE_12 ) {// I don't think we'll ever see a WRITE_12 but support it anyway... // - block = ((u32)(srb->cmnd[2 ]) <<24 ) | ((u32)(srb->cmnd[3 ]) <<16 ) | - ((u32)(srb->cmnd[4 ]) <<8 ) | ((u32)(srb->cmnd[5 ])); - - blocks = ((u32)(srb->cmnd[6 ]) <<24 ) | ((u32)(srb->cmnd[7 ]) <<16 ) | - ((u32)(srb->cmnd[8 ]) <<8 ) | ((u32)(srb->cmnd[9 ])); + block =load_be32_noalign ((__be32 *)&srb->cmnd[2 ]); + blocks =load_be32_noalign ((__be32 *)&srb->cmnd[6 ]);US_DEBUGP ("jumpshot_transport: WRITE_12: write block 0x%04lx count %ld\n" , block, blocks);return jumpshot_write_data (us, info, block, blocks);
drivers/usb/storage/shuttle_usbat.c +11 -25
@@ -44,6 +44,7 @@#include <linux/errno.h> #include <linux/slab.h> #include <linux/cdrom.h> +#include <asm/unaligned.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h>
@@ -957,10 +958,7 @@ static int usbat_flash_get_sector_count(struct us_data *us,if (rc !=USB_STOR_TRANSPORT_GOOD ) goto leave; - info->sectors = ((u32)(reply[117 ]) <<24 ) | - ((u32)(reply[116 ]) <<16 ) | - ((u32)(reply[115 ]) <<8 ) | - ((u32)(reply[114 ]) ); + info->sectors =load_le32_noalign ((__le32 *)&reply[114 ]); rc =USB_STOR_TRANSPORT_GOOD ;
@@ -1215,9 +1213,7 @@ static int usbat_hp8200e_handle_read10(struct us_data *us, buffer =kmalloc (len,GFP_NOIO );if (buffer ==NULL )/* bloody hell! */ return USB_STOR_TRANSPORT_FAILED ; - sector =short_pack (data[7 +3 ], data[7 +2 ]); - sector <<=16 ; - sector |=short_pack (data[7 +5 ], data[7 +4 ]); + sector =load_be32_noalign ((__be32 *)&data[7 +2 ]); transferred =0 ;while (transferred !=scsi_bufflen (srb)) {
@@ -1596,10 +1592,8 @@ static int usbat_flash_transport(struct scsi_cmnd * srb, struct us_data *us) }if (srb->cmnd[0 ] ==READ_10 ) { - block = ((u32)(srb->cmnd[2 ]) <<24 ) | ((u32)(srb->cmnd[3 ]) <<16 ) | - ((u32)(srb->cmnd[4 ]) <<8 ) | ((u32)(srb->cmnd[5 ])); - - blocks = ((u32)(srb->cmnd[7 ]) <<8 ) | ((u32)(srb->cmnd[8 ])); + block =load_be32_noalign ((__be32 *)&srb->cmnd[2 ]); + blocks =load_be16_noalign ((__be16 *)&srb->cmnd[7 ]);US_DEBUGP ("usbat_flash_transport: READ_10: read block 0x%04lx count %ld\n" , block, blocks);return usbat_flash_read_data (us, info, block, blocks);
@@ -1609,21 +1603,16 @@ static int usbat_flash_transport(struct scsi_cmnd * srb, struct us_data *us)/* * I don't think we'll ever see a READ_12 but support it anyway */ - block = ((u32)(srb->cmnd[2 ]) <<24 ) | ((u32)(srb->cmnd[3 ]) <<16 ) | - ((u32)(srb->cmnd[4 ]) <<8 ) | ((u32)(srb->cmnd[5 ])); - - blocks = ((u32)(srb->cmnd[6 ]) <<24 ) | ((u32)(srb->cmnd[7 ]) <<16 ) | - ((u32)(srb->cmnd[8 ]) <<8 ) | ((u32)(srb->cmnd[9 ])); + block =load_be32_noalign ((__be32 *)&srb->cmnd[2 ]); + blocks =load_be32_noalign ((__be32 *)&srb->cmnd[6 ]);US_DEBUGP ("usbat_flash_transport: READ_12: read block 0x%04lx count %ld\n" , block, blocks);return usbat_flash_read_data (us, info, block, blocks); }if (srb->cmnd[0 ] ==WRITE_10 ) { - block = ((u32)(srb->cmnd[2 ]) <<24 ) | ((u32)(srb->cmnd[3 ]) <<16 ) | - ((u32)(srb->cmnd[4 ]) <<8 ) | ((u32)(srb->cmnd[5 ])); - - blocks = ((u32)(srb->cmnd[7 ]) <<8 ) | ((u32)(srb->cmnd[8 ])); + block =load_be32_noalign ((__be32 *)&srb->cmnd[2 ]); + blocks =load_be16_noalign ((__be16 *)&srb->cmnd[7 ]);US_DEBUGP ("usbat_flash_transport: WRITE_10: write block 0x%04lx count %ld\n" , block, blocks);return usbat_flash_write_data (us, info, block, blocks);
@@ -1633,11 +1622,8 @@ static int usbat_flash_transport(struct scsi_cmnd * srb, struct us_data *us)/* * I don't think we'll ever see a WRITE_12 but support it anyway */ - block = ((u32)(srb->cmnd[2 ]) <<24 ) | ((u32)(srb->cmnd[3 ]) <<16 ) | - ((u32)(srb->cmnd[4 ]) <<8 ) | ((u32)(srb->cmnd[5 ])); - - blocks = ((u32)(srb->cmnd[6 ]) <<24 ) | ((u32)(srb->cmnd[7 ]) <<16 ) | - ((u32)(srb->cmnd[8 ]) <<8 ) | ((u32)(srb->cmnd[9 ])); + block =load_be16_noalign ((__be16 *)&srb->cmnd[2 ]); + blocks =load_be16_noalign ((__be16 *)&srb->cmnd[6 ]);US_DEBUGP ("usbat_flash_transport: WRITE_12: write block 0x%04lx count %ld\n" , block, blocks);return usbat_flash_write_data (us, info, block, blocks);
Signature · 1 line
1.6.1.rc1.262.gb6810