| Message ID | 20230130075615.17108-1-lukas.bulwahn@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | scsi: ufs: qcom: include specific ops when GENERIC_MSI_IRQ is set | expand |
On Mon, Jan 30, 2023 at 08:56:15AM +0100, Lukas Bulwahn wrote: > 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") > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> There is already a patch submitted for fixing this issue: https://lore.kernel.org/linux-scsi/20230126211831.2274211-1-arnd@kernel.org/ Thanks, Mani > --- > drivers/ufs/host/ufs-qcom.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c > index 681da3ea7154..14283f6dc3f7 100644 > --- a/drivers/ufs/host/ufs-qcom.c > +++ b/drivers/ufs/host/ufs-qcom.c > @@ -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); > -- > 2.17.1 >
diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c index 681da3ea7154..14283f6dc3f7 100644 --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c @@ -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);
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") Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> --- drivers/ufs/host/ufs-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)