| Message ID | 20241009083519.10088-11-pstanner@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Remove implicit devres from pci_intx() | expand |
On Wed, Oct 09, 2024 at 10:35:16AM +0200, 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. > > rts5208 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> > --- > drivers/staging/rts5208/rtsx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
On 10/9/24 11:38, Greg Kroah-Hartman wrote: > On Wed, Oct 09, 2024 at 10:35:16AM +0200, 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. >> >> rts5208 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> >> --- >> drivers/staging/rts5208/rtsx.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Hi Philipp, this driver (rts5208) will be removed soon - patch is send in. Discussion about removal: https://lore.kernel.org/linux-staging/2024100943-shank-washed-a765@gregkh/T/#t Thanks for your support. Bye Philipp
On Wed, 2024-10-09 at 21:41 +0200, Philipp Hortmann wrote: > On 10/9/24 11:38, Greg Kroah-Hartman wrote: > > On Wed, Oct 09, 2024 at 10:35:16AM +0200, 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. > > > > > > rts5208 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> > > > --- > > > drivers/staging/rts5208/rtsx.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > Hi Philipp, > > this driver (rts5208) will be removed soon - patch is send in. > > Discussion about removal: > https://lore.kernel.org/linux-staging/2024100943-shank-washed-a765@gregkh/T/#t Alright, thx for the heads up. I'm not entirely how best to deal with that, though. I could drop this patch, but then the driver would end up with an unmanaged pci_intx(). Might this be a problem for users if my series lands sooner than the removal, say in v6.13 and your removal in v6.14? P. > > Thanks for your support. > > Bye Philipp >
On Thu, Oct 10, 2024 at 10:03:30AM +0200, Philipp Stanner wrote: > On Wed, 2024-10-09 at 21:41 +0200, Philipp Hortmann wrote: > > On 10/9/24 11:38, Greg Kroah-Hartman wrote: > > > On Wed, Oct 09, 2024 at 10:35:16AM +0200, 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. > > > > > > > > rts5208 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> > > > > --- > > > > drivers/staging/rts5208/rtsx.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > > > > Hi Philipp, > > > > this driver (rts5208) will be removed soon - patch is send in. > > > > Discussion about removal: > > https://lore.kernel.org/linux-staging/2024100943-shank-washed-a765@gregkh/T/#t > > > Alright, thx for the heads up. > > I'm not entirely how best to deal with that, though. I could drop this > patch, but then the driver would end up with an unmanaged pci_intx(). > > Might this be a problem for users if my series lands sooner than the > removal, say in v6.13 and your removal in v6.14? The removal will happen in 6.13, I'm going to be queueing it up right now. thanks, greg k-h
On Thu, 2024-10-10 at 11:03 +0200, Greg Kroah-Hartman wrote: > On Thu, Oct 10, 2024 at 10:03:30AM +0200, Philipp Stanner wrote: > > On Wed, 2024-10-09 at 21:41 +0200, Philipp Hortmann wrote: > > > On 10/9/24 11:38, Greg Kroah-Hartman wrote: > > > > On Wed, Oct 09, 2024 at 10:35:16AM +0200, 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. > > > > > > > > > > rts5208 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> > > > > > --- > > > > > drivers/staging/rts5208/rtsx.c | 2 +- > > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > > > > > > > Hi Philipp, > > > > > > this driver (rts5208) will be removed soon - patch is send in. > > > > > > Discussion about removal: > > > https://lore.kernel.org/linux-staging/2024100943-shank-washed-a765@gregkh/T/#t > > > > > > Alright, thx for the heads up. > > > > I'm not entirely how best to deal with that, though. I could drop > > this > > patch, but then the driver would end up with an unmanaged > > pci_intx(). > > > > Might this be a problem for users if my series lands sooner than > > the > > removal, say in v6.13 and your removal in v6.14? > > The removal will happen in 6.13, I'm going to be queueing it up right > now. Alright, thx. Then I drop patch #10. P. > > thanks, > > greg k-h >
diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c index c4f54c311d05..4831eb035bf7 100644 --- a/drivers/staging/rts5208/rtsx.c +++ b/drivers/staging/rts5208/rtsx.c @@ -246,7 +246,7 @@ static int rtsx_acquire_irq(struct rtsx_dev *dev) } dev->irq = dev->pci->irq; - pci_intx(dev->pci, !chip->msi_en); + pcim_intx(dev->pci, !chip->msi_en); return 0; }
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. rts5208 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> --- drivers/staging/rts5208/rtsx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)