| Message ID | 20241209130632.132074-11-pstanner@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a31ef0835f7a4031cf81cc9644948676b5daa6fb |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | Remove implicit devres from pci_intx() | expand |
[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 >
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.
[+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.
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); } }