diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2022-12-31 00:48:47 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-12-31 00:48:47 +0300 |
| commit | 2d95c6deb64dfb1496bd202aaffdbdb4b420a196 (patch) | |
| tree | 13e9be4b7933879cd67afe55c8aa6699cf0b94ce /drivers/ufs/core/ufs_bsg.c | |
| parent | 4a5bd1a928a22c20f77821d0bd9c80849827e292 (diff) | |
| parent | 16ed9d312b42180242476d159dd2fab05129029a (diff) | |
| download | linux-2d95c6deb64dfb1496bd202aaffdbdb4b420a196.tar.xz | |
Merge patch series "scsi: ufs: core: Always read the descriptors with max length"
Arthur Simchaev <Arthur.Simchaev@wdc.com> says:
Read any descriptor with a maximum size of QUERY_DESC_MAX_SIZE.
According to the spec the device returns the actual size. Thus can
improve code readability and save CPU cycles. While at it, clean up
few leftovers around the descriptor size parameter.
Link: https://lore.kernel.org/r/1670763911-8695-1-git-send-email-Arthur.Simchaev@wdc.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/ufs/core/ufs_bsg.c')
| -rw-r--r-- | drivers/ufs/core/ufs_bsg.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/ufs/core/ufs_bsg.c b/drivers/ufs/core/ufs_bsg.c index a8e58faa7da2..0044029bcf7b 100644 --- a/drivers/ufs/core/ufs_bsg.c +++ b/drivers/ufs/core/ufs_bsg.c @@ -17,16 +17,11 @@ static int ufs_bsg_get_query_desc_size(struct ufs_hba *hba, int *desc_len, struct utp_upiu_query *qr) { int desc_size = be16_to_cpu(qr->length); - int desc_id = qr->idn; if (desc_size <= 0) return -EINVAL; - ufshcd_map_desc_id_to_length(hba, desc_id, desc_len); - if (!*desc_len) - return -EINVAL; - - *desc_len = min_t(int, *desc_len, desc_size); + *desc_len = min_t(int, QUERY_DESC_MAX_SIZE, desc_size); return 0; } |