| Message ID | 20241009083519.10088-10-pstanner@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Remove implicit devres from pci_intx() | expand |
On 10/9/24 17:35, 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. > > All users in ata enable their PCI-Device with pcim_enable_device(). Thus, > they need the always-managed version. > > Replace pci_intx() with pci_intx_unmanaged(). This contradicts the sentence above and the patche replaces pci_intx() with pcim_intx()... So s/pci_intx_unmanaged/pcim_intx in the above sentence ? > > Signed-off-by: Philipp Stanner <pstanner@redhat.com> > --- > drivers/ata/ahci.c | 2 +- > drivers/ata/ata_piix.c | 2 +- > drivers/ata/pata_rdc.c | 2 +- > drivers/ata/sata_sil24.c | 2 +- > drivers/ata/sata_sis.c | 2 +- > drivers/ata/sata_uli.c | 2 +- > drivers/ata/sata_vsc.c | 2 +- > 7 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c > index 45f63b09828a..9273ff3d4732 100644 > --- a/drivers/ata/ahci.c > +++ b/drivers/ata/ahci.c > @@ -1985,7 +1985,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) > > if (ahci_init_msi(pdev, n_ports, hpriv) < 0) { > /* legacy intx interrupts */ > - pci_intx(pdev, 1); > + pcim_intx(pdev, 1); > } > hpriv->irq = pci_irq_vector(pdev, 0); > > diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c > index 093b940bc953..d441246fa357 100644 > --- a/drivers/ata/ata_piix.c > +++ b/drivers/ata/ata_piix.c > @@ -1725,7 +1725,7 @@ static int piix_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) > * message-signalled interrupts currently). > */ > if (port_flags & PIIX_FLAG_CHECKINTR) > - pci_intx(pdev, 1); > + pcim_intx(pdev, 1); > > if (piix_check_450nx_errata(pdev)) { > /* This writes into the master table but it does not > diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c > index 0a9689862f71..09792aac7f9d 100644 > --- a/drivers/ata/pata_rdc.c > +++ b/drivers/ata/pata_rdc.c > @@ -340,7 +340,7 @@ static int rdc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) > return rc; > host->private_data = hpriv; > > - pci_intx(pdev, 1); > + pcim_intx(pdev, 1); > > host->flags |= ATA_HOST_PARALLEL_SCAN; > > diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c > index 72c03cbdaff4..b771ebd41252 100644 > --- a/drivers/ata/sata_sil24.c > +++ b/drivers/ata/sata_sil24.c > @@ -1317,7 +1317,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) > > if (sata_sil24_msi && !pci_enable_msi(pdev)) { > dev_info(&pdev->dev, "Using MSI\n"); > - pci_intx(pdev, 0); > + pcim_intx(pdev, 0); > } > > pci_set_master(pdev); > diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c > index ef8724986de3..b8b6d9eff3b8 100644 > --- a/drivers/ata/sata_sis.c > +++ b/drivers/ata/sata_sis.c > @@ -290,7 +290,7 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) > } > > pci_set_master(pdev); > - pci_intx(pdev, 1); > + pcim_intx(pdev, 1); > return ata_host_activate(host, pdev->irq, ata_bmdma_interrupt, > IRQF_SHARED, &sis_sht); > } > diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c > index 60ea45926cd1..52894ff49dcb 100644 > --- a/drivers/ata/sata_uli.c > +++ b/drivers/ata/sata_uli.c > @@ -221,7 +221,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) > } > > pci_set_master(pdev); > - pci_intx(pdev, 1); > + pcim_intx(pdev, 1); > return ata_host_activate(host, pdev->irq, ata_bmdma_interrupt, > IRQF_SHARED, &uli_sht); > } > diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c > index d39b87537168..a53a2dfc1e17 100644 > --- a/drivers/ata/sata_vsc.c > +++ b/drivers/ata/sata_vsc.c > @@ -384,7 +384,7 @@ static int vsc_sata_init_one(struct pci_dev *pdev, > pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x80); > > if (pci_enable_msi(pdev) == 0) > - pci_intx(pdev, 0); > + pcim_intx(pdev, 0); > > /* > * Config offset 0x98 is "Extended Control and Status Register 0"
On Wed, 2024-10-09 at 17:51 +0900, Damien Le Moal wrote: > On 10/9/24 17:35, 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. > > > > All users in ata enable their PCI-Device with pcim_enable_device(). > > Thus, > > they need the always-managed version. > > > > Replace pci_intx() with pci_intx_unmanaged(). > > This contradicts the sentence above and the patche replaces > pci_intx() with > pcim_intx()... So s/pci_intx_unmanaged/pcim_intx in the above > sentence ? Yes, absolutely correct, the commit message is broken. The code itself is fine, I grepped through it for pci_enable / pcim_enable P. > > > > > Signed-off-by: Philipp Stanner <pstanner@redhat.com> > > --- > > drivers/ata/ahci.c | 2 +- > > drivers/ata/ata_piix.c | 2 +- > > drivers/ata/pata_rdc.c | 2 +- > > drivers/ata/sata_sil24.c | 2 +- > > drivers/ata/sata_sis.c | 2 +- > > drivers/ata/sata_uli.c | 2 +- > > drivers/ata/sata_vsc.c | 2 +- > > 7 files changed, 7 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c > > index 45f63b09828a..9273ff3d4732 100644 > > --- a/drivers/ata/ahci.c > > +++ b/drivers/ata/ahci.c > > @@ -1985,7 +1985,7 @@ static int ahci_init_one(struct pci_dev > > *pdev, const struct pci_device_id *ent) > > > > if (ahci_init_msi(pdev, n_ports, hpriv) < 0) { > > /* legacy intx interrupts */ > > - pci_intx(pdev, 1); > > + pcim_intx(pdev, 1); > > } > > hpriv->irq = pci_irq_vector(pdev, 0); > > > > diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c > > index 093b940bc953..d441246fa357 100644 > > --- a/drivers/ata/ata_piix.c > > +++ b/drivers/ata/ata_piix.c > > @@ -1725,7 +1725,7 @@ static int piix_init_one(struct pci_dev > > *pdev, const struct pci_device_id *ent) > > * message-signalled interrupts currently). > > */ > > if (port_flags & PIIX_FLAG_CHECKINTR) > > - pci_intx(pdev, 1); > > + pcim_intx(pdev, 1); > > > > if (piix_check_450nx_errata(pdev)) { > > /* This writes into the master table but it does > > not > > diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c > > index 0a9689862f71..09792aac7f9d 100644 > > --- a/drivers/ata/pata_rdc.c > > +++ b/drivers/ata/pata_rdc.c > > @@ -340,7 +340,7 @@ static int rdc_init_one(struct pci_dev *pdev, > > const struct pci_device_id *ent) > > return rc; > > host->private_data = hpriv; > > > > - pci_intx(pdev, 1); > > + pcim_intx(pdev, 1); > > > > host->flags |= ATA_HOST_PARALLEL_SCAN; > > > > diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c > > index 72c03cbdaff4..b771ebd41252 100644 > > --- a/drivers/ata/sata_sil24.c > > +++ b/drivers/ata/sata_sil24.c > > @@ -1317,7 +1317,7 @@ static int sil24_init_one(struct pci_dev > > *pdev, const struct pci_device_id *ent) > > > > if (sata_sil24_msi && !pci_enable_msi(pdev)) { > > dev_info(&pdev->dev, "Using MSI\n"); > > - pci_intx(pdev, 0); > > + pcim_intx(pdev, 0); > > } > > > > pci_set_master(pdev); > > diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c > > index ef8724986de3..b8b6d9eff3b8 100644 > > --- a/drivers/ata/sata_sis.c > > +++ b/drivers/ata/sata_sis.c > > @@ -290,7 +290,7 @@ static int sis_init_one(struct pci_dev *pdev, > > const struct pci_device_id *ent) > > } > > > > pci_set_master(pdev); > > - pci_intx(pdev, 1); > > + pcim_intx(pdev, 1); > > return ata_host_activate(host, pdev->irq, > > ata_bmdma_interrupt, > > IRQF_SHARED, &sis_sht); > > } > > diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c > > index 60ea45926cd1..52894ff49dcb 100644 > > --- a/drivers/ata/sata_uli.c > > +++ b/drivers/ata/sata_uli.c > > @@ -221,7 +221,7 @@ static int uli_init_one(struct pci_dev *pdev, > > const struct pci_device_id *ent) > > } > > > > pci_set_master(pdev); > > - pci_intx(pdev, 1); > > + pcim_intx(pdev, 1); > > return ata_host_activate(host, pdev->irq, > > ata_bmdma_interrupt, > > IRQF_SHARED, &uli_sht); > > } > > diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c > > index d39b87537168..a53a2dfc1e17 100644 > > --- a/drivers/ata/sata_vsc.c > > +++ b/drivers/ata/sata_vsc.c > > @@ -384,7 +384,7 @@ static int vsc_sata_init_one(struct pci_dev > > *pdev, > > pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, > > 0x80); > > > > if (pci_enable_msi(pdev) == 0) > > - pci_intx(pdev, 0); > > + pcim_intx(pdev, 0); > > > > /* > > * Config offset 0x98 is "Extended Control and Status > > Register 0" > >
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 45f63b09828a..9273ff3d4732 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1985,7 +1985,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (ahci_init_msi(pdev, n_ports, hpriv) < 0) { /* legacy intx interrupts */ - pci_intx(pdev, 1); + pcim_intx(pdev, 1); } hpriv->irq = pci_irq_vector(pdev, 0); diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 093b940bc953..d441246fa357 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -1725,7 +1725,7 @@ static int piix_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) * message-signalled interrupts currently). */ if (port_flags & PIIX_FLAG_CHECKINTR) - pci_intx(pdev, 1); + pcim_intx(pdev, 1); if (piix_check_450nx_errata(pdev)) { /* This writes into the master table but it does not diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c index 0a9689862f71..09792aac7f9d 100644 --- a/drivers/ata/pata_rdc.c +++ b/drivers/ata/pata_rdc.c @@ -340,7 +340,7 @@ static int rdc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) return rc; host->private_data = hpriv; - pci_intx(pdev, 1); + pcim_intx(pdev, 1); host->flags |= ATA_HOST_PARALLEL_SCAN; diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 72c03cbdaff4..b771ebd41252 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c @@ -1317,7 +1317,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (sata_sil24_msi && !pci_enable_msi(pdev)) { dev_info(&pdev->dev, "Using MSI\n"); - pci_intx(pdev, 0); + pcim_intx(pdev, 0); } pci_set_master(pdev); diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c index ef8724986de3..b8b6d9eff3b8 100644 --- a/drivers/ata/sata_sis.c +++ b/drivers/ata/sata_sis.c @@ -290,7 +290,7 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) } pci_set_master(pdev); - pci_intx(pdev, 1); + pcim_intx(pdev, 1); return ata_host_activate(host, pdev->irq, ata_bmdma_interrupt, IRQF_SHARED, &sis_sht); } diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c index 60ea45926cd1..52894ff49dcb 100644 --- a/drivers/ata/sata_uli.c +++ b/drivers/ata/sata_uli.c @@ -221,7 +221,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) } pci_set_master(pdev); - pci_intx(pdev, 1); + pcim_intx(pdev, 1); return ata_host_activate(host, pdev->irq, ata_bmdma_interrupt, IRQF_SHARED, &uli_sht); } diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c index d39b87537168..a53a2dfc1e17 100644 --- a/drivers/ata/sata_vsc.c +++ b/drivers/ata/sata_vsc.c @@ -384,7 +384,7 @@ static int vsc_sata_init_one(struct pci_dev *pdev, pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x80); if (pci_enable_msi(pdev) == 0) - pci_intx(pdev, 0); + pcim_intx(pdev, 0); /* * Config offset 0x98 is "Extended Control and Status Register 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. All users in ata enable their PCI-Device with pcim_enable_device(). Thus, they need the always-managed version. Replace pci_intx() with pci_intx_unmanaged(). Signed-off-by: Philipp Stanner <pstanner@redhat.com> --- drivers/ata/ahci.c | 2 +- drivers/ata/ata_piix.c | 2 +- drivers/ata/pata_rdc.c | 2 +- drivers/ata/sata_sil24.c | 2 +- drivers/ata/sata_sis.c | 2 +- drivers/ata/sata_uli.c | 2 +- drivers/ata/sata_vsc.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)