From 43031c379c196ed1ab049ed29295e1075bfaeedb Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 28 Oct 2021 14:23:31 -0700 Subject: [PATCH] ANDROID: Revert "FROMGIT: ufs: ufs-exynos: use UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE" Android commit d9ade6f2d96f ("FROMGIT: ufs: ufs-exynos: use UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE") differs from the upstream commit f1ef9047aaab ("scsi: ufs: ufs-exynos: Use UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE"). Additionally, that upstream commit has already been backported. See also Android commit e74b237ef989 ("scsi: ufs: ufs-exynos: Use UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE"). Hence this revert. Bug: 204438323 Change-Id: I61242407e621e7f963a32d83daf63b30efddbfd9 Signed-off-by: Bart Van Assche --- drivers/scsi/ufs/ufs-exynos.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/ufs/ufs-exynos.c b/drivers/scsi/ufs/ufs-exynos.c index d929bcdce39d..0246ea99df7b 100644 --- a/drivers/scsi/ufs/ufs-exynos.c +++ b/drivers/scsi/ufs/ufs-exynos.c @@ -1261,8 +1261,7 @@ struct exynos_ufs_drv_data exynos_ufs_drvs = { EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL | EXYNOS_UFS_OPT_BROKEN_RX_SEL_IDX | EXYNOS_UFS_OPT_SKIP_CONNECTION_ESTAB | - EXYNOS_UFS_OPT_USE_SW_HIBERN8_TIMER | - UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE, + EXYNOS_UFS_OPT_USE_SW_HIBERN8_TIMER, .drv_init = exynos7_ufs_drv_init, .pre_link = exynos7_ufs_pre_link, .post_link = exynos7_ufs_post_link,