| Message ID | 20240801174608.50592-10-pstanner@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Remove pcim_iomap_regions_request_all() | expand |
On Thu, 01 Aug 2024 19:46:07 +0200, Philipp Stanner wrote: > > pcim_iomap_table() and pcim_iomap_regions_request_all() have been > deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate > pcim_iomap_table(), pcim_iomap_regions_request_all()"). > > Replace these functions with their successors, pcim_iomap() and > pcim_request_all_regions() > > Signed-off-by: Philipp Stanner <pstanner@redhat.com> Reviewed-by: Takashi Iwai <tiwai@suse.de> And feel free to take my ack to v2 if the further change will be only about the description, too :) thanks, Takashi > --- > sound/pci/korg1212/korg1212.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c > index 5c2cac201a28..b5428ac34d3b 100644 > --- a/sound/pci/korg1212/korg1212.c > +++ b/sound/pci/korg1212/korg1212.c > @@ -2106,7 +2106,7 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci) > for (i=0; i<kAudioChannels; i++) > korg1212->volumePhase[i] = 0; > > - err = pcim_iomap_regions_request_all(pci, 1 << 0, "korg1212"); > + err = pcim_request_all_regions(pci, "korg1212"); > if (err < 0) > return err; > > @@ -2128,7 +2128,9 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci) > korg1212->iomem2, iomem2_size, > stateName[korg1212->cardState]); > > - korg1212->iobase = pcim_iomap_table(pci)[0]; > + korg1212->iobase = pcim_iomap(pci, 0, 0); > + if (!korg1212->iobase) > + return -ENOMEM; > > err = devm_request_irq(&pci->dev, pci->irq, snd_korg1212_interrupt, > IRQF_SHARED, > -- > 2.45.2 >
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 5c2cac201a28..b5428ac34d3b 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c @@ -2106,7 +2106,7 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci) for (i=0; i<kAudioChannels; i++) korg1212->volumePhase[i] = 0; - err = pcim_iomap_regions_request_all(pci, 1 << 0, "korg1212"); + err = pcim_request_all_regions(pci, "korg1212"); if (err < 0) return err; @@ -2128,7 +2128,9 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci) korg1212->iomem2, iomem2_size, stateName[korg1212->cardState]); - korg1212->iobase = pcim_iomap_table(pci)[0]; + korg1212->iobase = pcim_iomap(pci, 0, 0); + if (!korg1212->iobase) + return -ENOMEM; err = devm_request_irq(&pci->dev, pci->irq, snd_korg1212_interrupt, IRQF_SHARED,
pcim_iomap_table() and pcim_iomap_regions_request_all() have been deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). Replace these functions with their successors, pcim_iomap() and pcim_request_all_regions() Signed-off-by: Philipp Stanner <pstanner@redhat.com> --- sound/pci/korg1212/korg1212.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)