[v3] Remove implicit devres from pci_intx()

[PATCH v3 09/11] wifi: qtnfmac: use always-managed version of pcim_intx()

Posted by Philipp Stanner 1 week, 6 days ago

pci_intx() is a hybrid function which can sometimes be managed through
devres. To remove this hybrid nature from pci_intx(), it is necessary to
port users to either an always-managed or a never-managed version.

qtnfmac enables its PCI-Device with pcim_enable_device(). Thus, it needs
the always-managed version.

Replace pci_intx() with pcim_intx().

Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Acked-by: Kalle Valo <kvalo@kernel.org>
---
 drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c b/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c
index f66eb43094d4..3adcfac2886f 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c
@@ -204,7 +204,7 @@ static void qtnf_pcie_init_irq(struct qtnf_pcie_bus_priv *priv, bool use_msi)
 
 	if (!priv->msi_enabled) {
 		pr_warn("legacy PCIE interrupts enabled\n");
-		pci_intx(pdev, 1);
+		pcim_intx(pdev, 1);
 	}
 }
 
-- 
2.47.1

Re: [PATCH v3 09/11] wifi: qtnfmac: use always-managed version of pcim_intx()

Posted by Bjorn Helgaas 1 week, 2 days ago

[cc->to: Igor]

On Mon, Dec 09, 2024 at 02:06:31PM +0100, Philipp Stanner wrote:
> pci_intx() is a hybrid function which can sometimes be managed through
> devres. To remove this hybrid nature from pci_intx(), it is necessary to
> port users to either an always-managed or a never-managed version.
> 
> qtnfmac enables its PCI-Device with pcim_enable_device(). Thus, it needs
> the always-managed version.
> 
> Replace pci_intx() with pcim_intx().
> 
> Signed-off-by: Philipp Stanner <pstanner@redhat.com>
> Acked-by: Kalle Valo <kvalo@kernel.org>

Hoping for an ack from Igor, too.

> ---
>  drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c b/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c
> index f66eb43094d4..3adcfac2886f 100644
> --- a/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c
> +++ b/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c
> @@ -204,7 +204,7 @@ static void qtnf_pcie_init_irq(struct qtnf_pcie_bus_priv *priv, bool use_msi)
>  
>  	if (!priv->msi_enabled) {
>  		pr_warn("legacy PCIE interrupts enabled\n");
> -		pci_intx(pdev, 1);
> +		pcim_intx(pdev, 1);
>  	}
>  }
>  
> -- 
> 2.47.1
>

Re: [PATCH v3 09/11] wifi: qtnfmac: use always-managed version of pcim_intx()

Posted by Kalle Valo 1 week, 2 days ago

Bjorn Helgaas <helgaas@kernel.org> writes:

> [cc->to: Igor]
>
> On Mon, Dec 09, 2024 at 02:06:31PM +0100, Philipp Stanner wrote:
>> pci_intx() is a hybrid function which can sometimes be managed through
>> devres. To remove this hybrid nature from pci_intx(), it is necessary to
>> port users to either an always-managed or a never-managed version.
>> 
>> qtnfmac enables its PCI-Device with pcim_enable_device(). Thus, it needs
>> the always-managed version.
>> 
>> Replace pci_intx() with pcim_intx().
>> 
>> Signed-off-by: Philipp Stanner <pstanner@redhat.com>
>> Acked-by: Kalle Valo <kvalo@kernel.org>
>
> Hoping for an ack from Igor, too.

Igor hasn't been around for a while so I'm not expecting see an ack from
him, I think the whole qtnfmac driver should be removed in the future.
Feel free to take the patch as is.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH v3 09/11] wifi: qtnfmac: use always-managed version of pcim_intx()

Posted by Bjorn Helgaas 1 week, 1 day ago

[+cc personal address for Igor]

On Fri, Dec 13, 2024 at 12:30:42PM +0200, Kalle Valo wrote:
> Bjorn Helgaas <helgaas@kernel.org> writes:
> 
> > [cc->to: Igor]
> >
> > On Mon, Dec 09, 2024 at 02:06:31PM +0100, Philipp Stanner wrote:
> >> pci_intx() is a hybrid function which can sometimes be managed through
> >> devres. To remove this hybrid nature from pci_intx(), it is necessary to
> >> port users to either an always-managed or a never-managed version.
> >> 
> >> qtnfmac enables its PCI-Device with pcim_enable_device(). Thus, it needs
> >> the always-managed version.
> >> 
> >> Replace pci_intx() with pcim_intx().
> >> 
> >> Signed-off-by: Philipp Stanner <pstanner@redhat.com>
> >> Acked-by: Kalle Valo <kvalo@kernel.org>
> >
> > Hoping for an ack from Igor, too.
> 
> Igor hasn't been around for a while so I'm not expecting see an ack from
> him, I think the whole qtnfmac driver should be removed in the future.
> Feel free to take the patch as is.

Thanks, Kalle, will do.