Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6059ac6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ANDROID: fix merge issue in 5.4.22 



ufs-mediatek.c ended up duplicating the ufs_mtk_apply_dev_quirks()
function, which caused build breaks.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia391fc93e7c5a54005e1c7df4280211b269000cd
parent 47c9e67e

drivers/scsi/ufs/ufs-mediatek.c

+0 −9
Original line number Diff line number Diff line
@@ -483,15 +483,6 @@ static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba, 
	return 0;

}



static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba,

				    struct ufs_dev_desc *card)

{

	if (card->wmanufacturerid == UFS_VENDOR_SAMSUNG)

		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TACTIVATE), 6);



	return 0;

}



/**

 * struct ufs_hba_mtk_vops - UFS MTK specific variant operations

 *