Skip to content

Commit 49f262b

Browse files
arndbmartinkpetersen
authored andcommitted
scsi: ufs: qcom: fix platform_msi_domain_free_irqs() reference
The newly added MSI support is mostly hidden inside of an #ifdef, except for one line that now causes a build failure when MSI is disabled: drivers/ufs/host/ufs-qcom.c: In function 'ufs_qcom_remove': drivers/ufs/host/ufs-qcom.c:1698:9: error: implicit declaration of function 'platform_msi_domain_free_irqs' [-Werror=i] 1698 | platform_msi_domain_free_irqs(hba->dev); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Above that, the symbol that guards the other call was recently removed, so that is all dead code at the moment. Remove the incorrect #ifdef and instead of a Kconfig dependency to only allow building the driver when CONFIG_GENERIC_MSI_IRQ is enabled. This symbol is always present when PCI_MSI or ARM_GIC_V3_ITS are enabled, both of which should be present on kernels that can run on Qualcomm SoCs. The 'select RESET_CONTROLLER' in combination with this dependency unfortunately causes a dependency loop and this is a user-visible symbol, so it's better to change both to 'depends on'. Link: https://lore.kernel.org/r/[email protected] Fixes: 519b627 ("scsi: ufs: qcom: Add MCQ ESI config vendor specific ops") Fixes: 13e7acc ("genirq: Get rid of GENERIC_MSI_IRQ_DOMAIN") Signed-off-by: Arnd Bergmann <[email protected]> Reviewed-by: Manivannan Sadhasivam <[email protected]> Acked-by: Can Guo <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 5adca38 commit 49f262b

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

drivers/ufs/host/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ config SCSI_UFS_DWC_TC_PLATFORM
5757
config SCSI_UFS_QCOM
5858
tristate "QCOM specific hooks to UFS controller platform driver"
5959
depends on SCSI_UFSHCD_PLATFORM && ARCH_QCOM
60+
depends on GENERIC_MSI_IRQ
61+
depends on RESET_CONTROLLER
6062
select QCOM_SCM if SCSI_UFS_CRYPTO
61-
select RESET_CONTROLLER
6263
help
6364
This selects the QCOM specific additions to UFSHCD platform driver.
6465
UFS host on QCOM needs some vendor specific configuration before

drivers/ufs/host/ufs-qcom.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,6 @@ static int ufs_qcom_get_outstanding_cqs(struct ufs_hba *hba,
15381538
return 0;
15391539
}
15401540

1541-
#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
15421541
static void ufs_qcom_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg)
15431542
{
15441543
struct device *dev = msi_desc_to_dev(desc);
@@ -1626,13 +1625,6 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
16261625
return ret;
16271626
}
16281627

1629-
#else
1630-
static int ufs_qcom_config_esi(struct ufs_hba *hba)
1631-
{
1632-
return -EOPNOTSUPP;
1633-
}
1634-
#endif
1635-
16361628
/*
16371629
* struct ufs_hba_qcom_vops - UFS QCOM specific variant operations
16381630
*

0 commit comments

Comments
 (0)