Skip to contentSkip to conversation

scsi: ufs: qcom: include specific ops when GENERIC_MSI_IRQ is set

PATCH In review Lukas Bulwahn 2 participants 2 messages Jan 30, 2023

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: ufs: qcom: include specific ops when GENERIC_MSI_IRQ is set

Commit 13e7accb81d6 ("genirq: Get rid of GENERIC_MSI_IRQ_DOMAIN") removes the config GENERIC_MSI_IRQ_DOMAIN and replaces all references with GENERIC_MSI_IRQ.

Probably due to concurrent development, commit 519b6274a777 ("scsi: ufs:
qcom: Add MCQ ESI config vendor specific ops") adds an ifdef block conditional under the config GENERIC_MSI_IRQ_DOMAIN.

Make this code conditional under the existing config GENERIC_MSI_IRQ.

Fixes 519b6274a777 ("scsi: ufs: qcom: Add MCQ ESI config vendor specific ops")
---
 drivers/ufs/host/ufs-qcom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/ufs-qcom.c +1 -1
index 681da3ea7154..14283f6dc3f7 100644
@@ -1538,7 +1538,7 @@ static int ufs_qcom_get_outstanding_cqs(struct ufs_hba *hba,
 	return 0;
 }
 
-#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
+#ifdef CONFIG_GENERIC_MSI_IRQ
 static void ufs_qcom_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg)
 {
 	struct device *dev = msi_desc_to_dev(desc);
Signature · 1 line
2.17.1
#1 lore raw
Quoted 4 lines · Lukas Bulwahn

Commit 13e7accb81d6 ("genirq: Get rid of GENERIC_MSI_IRQ_DOMAIN") removes the config GENERIC_MSI_IRQ_DOMAIN and replaces all references with GENERIC_MSI_IRQ.

Quoted 8 lines

Probably due to concurrent development, commit 519b6274a777 ("scsi: ufs:
qcom: Add MCQ ESI config vendor specific ops") adds an ifdef block conditional under the config GENERIC_MSI_IRQ_DOMAIN.

Make this code conditional under the existing config GENERIC_MSI_IRQ.

Fixes 519b6274a777 ("scsi: ufs: qcom: Add MCQ ESI config vendor specific ops")

There is already a patch submitted for fixing this issue:
https://lore.kernel.org/linux-scsi/[email protected]/

Thanks,
Mani

Quoted 20 lines
---
 drivers/ufs/host/ufs-qcom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/ufs-qcom.c +1 -1
index 681da3ea7154..14283f6dc3f7 100644
@@ -1538,7 +1538,7 @@ static int ufs_qcom_get_outstanding_cqs(struct ufs_hba *hba,
 	return 0;
 }
 
-#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
+#ifdef CONFIG_GENERIC_MSI_IRQ
 static void ufs_qcom_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg)
 {
 	struct device *dev = msi_desc_to_dev(desc);
Signature · 1 line
2.17.1
Signature · 1 line
மணிவண்ணன் சதாசிவம்