From b92c721efe31d88adcc6ce713b39fe7cbb63e120 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Tue, 14 Jan 2025 12:12:19 +0000 Subject: [PATCH] ufs: Remove ufshcd_vops_reinit_notify In Linux v6.13, commit 7bac65687510 ("scsi: ufs: qcom: Power off the PHY if it was already powered on in ufs_qcom_power_up_sequence()") removed the 'reinit_notify' function pointer from the 'ufs_hba_variant_ops' structure. This breaks the build for the Tegra UFS driver because we maintain a copy of the upstream header file 'ufshcd-priv.h' in order to build the Tegra UFS driver as an out-of-tree driver. It is possible to fix this by using conftest to detect if the 'reinit_notify' function pointer is defined in the kernel's 'ufs_hba_variant_ops' structure. However, given that the Tegra UFS driver does not use the 'ufshcd_vops_reinit_notify' where this function pointer is referenced, it is simpler to remove the function ufshcd_vops_reinit_notify completely. Bug 4991705 Change-Id: I2228f2a26640e13f61721e82856cc32b8d570809 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3283377 Reviewed-by: Brad Griffis GVS: buildbot_gerritrpt --- include/drivers-private/scsi/ufs/k67/ufshcd-priv.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/drivers-private/scsi/ufs/k67/ufshcd-priv.h b/include/drivers-private/scsi/ufs/k67/ufshcd-priv.h index f42d99ce..b37e2a40 100644 --- a/include/drivers-private/scsi/ufs/k67/ufshcd-priv.h +++ b/include/drivers-private/scsi/ufs/k67/ufshcd-priv.h @@ -241,12 +241,6 @@ static inline void ufshcd_vops_config_scaling_param(struct ufs_hba *hba, hba->vops->config_scaling_param(hba, p, data); } -static inline void ufshcd_vops_reinit_notify(struct ufs_hba *hba) -{ - if (hba->vops && hba->vops->reinit_notify) - hba->vops->reinit_notify(hba); -} - static inline int ufshcd_vops_mcq_config_resource(struct ufs_hba *hba) { if (hba->vops && hba->vops->mcq_config_resource)