Commit 458a45f5 authored by Bean Huo's avatar Bean Huo Committed by Martin K. Petersen
Browse files

scsi: ufs: Remove max_t in ufs_get_device_desc 

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: default avatarStanley Chu <stanley.chu@mediatek.com>
Acked-by: default avatarAvri Altman <avri.altman@wdc.com>
Signed-off-by: default avatarBart van Assche <bvanassche@acm.org>
Signed-off-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fc498301

drivers/scsi/ufs/ufshcd.c

+1 −4
Original line number Diff line number Diff line
@@ -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;