From: Andy Shevchenko Date: Wed, 16 Oct 2024 13:18:44 +0000 (+0300) Subject: ata: libata-scsi: Refactor scsi_6_lba_len() with use of get_unaligned_be24() X-Git-Tag: v6.13-rc1~212^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08b64eeee4d6ce245c9291dd18d249c3b86723b7;p=thirdparty%2Fkernel%2Flinux.git ata: libata-scsi: Refactor scsi_6_lba_len() with use of get_unaligned_be24() Refactor scsi_6_lba_len() with use of get_unaligned_be24() to make it consistent with other similar helper implementations. Signed-off-by: Andy Shevchenko Reviewed-by: Damien Le Moal Link: https://lore.kernel.org/r/20241016131845.898632-1-andriy.shevchenko@linux.intel.com Signed-off-by: Niklas Cassel --- diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index a4aedf7e17758..c97fc8dc270d2 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -1334,17 +1334,8 @@ static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc) */ static void scsi_6_lba_len(const u8 *cdb, u64 *plba, u32 *plen) { - u64 lba = 0; - u32 len; - - lba |= ((u64)(cdb[1] & 0x1f)) << 16; - lba |= ((u64)cdb[2]) << 8; - lba |= ((u64)cdb[3]); - - len = cdb[4]; - - *plba = lba; - *plen = len; + *plba = get_unaligned_be24(&cdb[1]) & 0x1fffff; + *plen = cdb[4]; } /**