mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-31 03:35:32 -04:00
ALSA: sis7019: Use pcim_iomap_region() for MMIO BAR
Replace the open-coded pcim_request_all_regions() + devm_ioremap() pair with per-BAR pcim helpers: reserve BAR0 (the I/O port region, used via inl/outl) with pcim_request_region(), and reserve + iomap BAR1 (MMIO) with a single pcim_iomap_region() call. This folds the BAR1 reserve and iomap into one managed call. The error check moves from a NULL test to IS_ERR(), since pcim_iomap_region() returns an IOMEM_ERR_PTR on failure. Assisted-by: opencode:hy3-free Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: https://patch.msgid.link/20260720000929.1432533-1-rosenp@gmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
committed by
Takashi Iwai
parent
4797f26715
commit
2d07693875
@@ -1260,16 +1260,16 @@ static int sis_chip_create(struct snd_card *card,
|
||||
sis->irq = -1;
|
||||
sis->ioport = pci_resource_start(pci, 0);
|
||||
|
||||
rc = pcim_request_all_regions(pci, "SiS7019");
|
||||
rc = pcim_request_region(pci, 0, "SiS7019");
|
||||
if (rc) {
|
||||
dev_err(&pci->dev, "unable request regions\n");
|
||||
dev_err(&pci->dev, "unable request I/O region\n");
|
||||
return rc;
|
||||
}
|
||||
|
||||
sis->ioaddr = devm_ioremap(&pci->dev, pci_resource_start(pci, 1), 0x4000);
|
||||
if (!sis->ioaddr) {
|
||||
sis->ioaddr = pcim_iomap_region(pci, 1, "SiS7019");
|
||||
if (IS_ERR(sis->ioaddr)) {
|
||||
dev_err(&pci->dev, "unable to remap MMIO, aborting\n");
|
||||
return -EIO;
|
||||
return PTR_ERR(sis->ioaddr);
|
||||
}
|
||||
|
||||
rc = sis_alloc_suspend(sis);
|
||||
|
||||
Reference in New Issue
Block a user