scsi: ufs: Remove max_t in ufs_get_device_desc
authorBean Huo <beanhuo@micron.com>
Wed, 3 Jun 2020 09:19:55 +0000 (11:19 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 16 Jun 2020 03:17:45 +0000 (23:17 -0400)
For the UFS device, the maximum descriptor size is 255, max_t called on
ufs_get_device_desc() is useless.

Link: https://lore.kernel.org/r/20200603091959.27618-2-huobean@gmail.com
Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
Acked-by: Avri Altman <avri.altman@wdc.com>
Signed-off-by: Bart van Assche <bvanassche@acm.org>
Signed-off-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ufs/ufshcd.c

index e83afcc56f88e30ddc27b9318018990bcfcd85b6..ec6fbedff58e73d485e903d5eb7f4386959ed704 100644 (file)
@@ -7005,14 +7005,11 @@ static void ufs_fixup_device_setup(struct ufs_hba *hba)
 static int ufs_get_device_desc(struct ufs_hba *hba)
 {
        int err;
-       size_t buff_len;
        u8 model_index;
        u8 *desc_buf;
        struct ufs_dev_info *dev_info = &hba->dev_info;
 
-       buff_len = max_t(size_t, hba->desc_size.dev_desc,
-                        QUERY_DESC_MAX_SIZE + 1);
-       desc_buf = kmalloc(buff_len, GFP_KERNEL);
+       desc_buf = kmalloc(QUERY_DESC_MAX_SIZE, GFP_KERNEL);
        if (!desc_buf) {
                err = -ENOMEM;
                goto out;