From fc8041ed6a3be1ee999fc5ccce46ddee18ada6ef Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Fri, 14 Oct 2022 09:39:47 +0100 Subject: [PATCH] scsi: ufs: Fix build for Linux v5.16 When building the UFS driver for Linux v5.16 some header files such as keyslot-manager.h are not found and the build fails. Update the UFS driver and reorganise the header files to fix the build for Linux v5.16. Bug 3820317 Change-Id: I10eea40411369e4c5d6809086bb1c35628c0bbad Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2791963 Reviewed-by: Kartik . Reviewed-by: Abhilash G Reviewed-by: Laxman Dewangan GVS: Gerrit_Virtual_Submit --- drivers/scsi/ufs/ufs-tegra.c | 10 +++++----- include/drivers-private/scsi/ufs/{k517 => k516}/ufs.h | 0 .../scsi/ufs/{k517 => k516}/ufs_quirks.h | 0 .../scsi/ufs/{k517 => k516}/ufshcd-pltfrm.h | 0 .../drivers-private/scsi/ufs/{k517 => k516}/ufshcd.h | 0 .../drivers-private/scsi/ufs/{k517 => k516}/ufshci.h | 0 .../drivers-private/scsi/ufs/{k517 => k516}/unipro.h | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename include/drivers-private/scsi/ufs/{k517 => k516}/ufs.h (100%) rename include/drivers-private/scsi/ufs/{k517 => k516}/ufs_quirks.h (100%) rename include/drivers-private/scsi/ufs/{k517 => k516}/ufshcd-pltfrm.h (100%) rename include/drivers-private/scsi/ufs/{k517 => k516}/ufshcd.h (100%) rename include/drivers-private/scsi/ufs/{k517 => k516}/ufshci.h (100%) rename include/drivers-private/scsi/ufs/{k517 => k516}/unipro.h (100%) diff --git a/drivers/scsi/ufs/ufs-tegra.c b/drivers/scsi/ufs/ufs-tegra.c index bada9abe..780ee83d 100644 --- a/drivers/scsi/ufs/ufs-tegra.c +++ b/drivers/scsi/ufs/ufs-tegra.c @@ -22,16 +22,16 @@ #include #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0) #include #include #include #include #else -#include -#include -#include -#include +#include +#include +#include +#include #endif #include "ufs-tegra.h" diff --git a/include/drivers-private/scsi/ufs/k517/ufs.h b/include/drivers-private/scsi/ufs/k516/ufs.h similarity index 100% rename from include/drivers-private/scsi/ufs/k517/ufs.h rename to include/drivers-private/scsi/ufs/k516/ufs.h diff --git a/include/drivers-private/scsi/ufs/k517/ufs_quirks.h b/include/drivers-private/scsi/ufs/k516/ufs_quirks.h similarity index 100% rename from include/drivers-private/scsi/ufs/k517/ufs_quirks.h rename to include/drivers-private/scsi/ufs/k516/ufs_quirks.h diff --git a/include/drivers-private/scsi/ufs/k517/ufshcd-pltfrm.h b/include/drivers-private/scsi/ufs/k516/ufshcd-pltfrm.h similarity index 100% rename from include/drivers-private/scsi/ufs/k517/ufshcd-pltfrm.h rename to include/drivers-private/scsi/ufs/k516/ufshcd-pltfrm.h diff --git a/include/drivers-private/scsi/ufs/k517/ufshcd.h b/include/drivers-private/scsi/ufs/k516/ufshcd.h similarity index 100% rename from include/drivers-private/scsi/ufs/k517/ufshcd.h rename to include/drivers-private/scsi/ufs/k516/ufshcd.h diff --git a/include/drivers-private/scsi/ufs/k517/ufshci.h b/include/drivers-private/scsi/ufs/k516/ufshci.h similarity index 100% rename from include/drivers-private/scsi/ufs/k517/ufshci.h rename to include/drivers-private/scsi/ufs/k516/ufshci.h diff --git a/include/drivers-private/scsi/ufs/k517/unipro.h b/include/drivers-private/scsi/ufs/k516/unipro.h similarity index 100% rename from include/drivers-private/scsi/ufs/k517/unipro.h rename to include/drivers-private/scsi/ufs/k516/unipro.h