UPSTREAM: scsi: ufs: core: Use scsi_get_lba() to get LBA

Use the scsi_get_lba() helper instead of a function internal to the
SCSI disk driver. Remove #include "sd.h".

Link: https://lore.kernel.org/r/20210609033929.3815-16-martin.petersen@oracle.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Message-Id: <20210609033929.3815-16-martin.petersen@oracle.com>
(cherry picked from commit 5481508885)
Bug: 204438323
Signed-off-by: Bart Van Assche <bvanassche@google.com>
Change-Id: Ia0f0e62e7e1596065bd6011017bc6c4d5b28ca80
This commit is contained in:
Martin K. Petersen
2021-06-08 23:39:29 -04:00
committed by Bart Van Assche
parent c577744552
commit ed0d82c712

View File

@@ -26,7 +26,6 @@
#include "ufshcd-crypto.h"
#include "ufshpb.h"
#include <asm/unaligned.h>
#include "../sd.h"
#define CREATE_TRACE_POINTS
#include <trace/events/ufs.h>
@@ -406,7 +405,7 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag,
/* trace UPIU also */
ufshcd_add_cmd_upiu_trace(hba, tag, str_t);
opcode = cmd->cmnd[0];
lba = sectors_to_logical(cmd->device, blk_rq_pos(cmd->request));
lba = scsi_get_lba(cmd);
if (opcode == READ_10 || opcode == WRITE_10) {
/*