]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
media: solo6x10: Replace deprecated PCI functions
authorPhilipp Stanner <phasta@kernel.org>
Fri, 4 Apr 2025 13:53:44 +0000 (15:53 +0200)
committerHans Verkuil <hverkuil@xs4all.nl>
Fri, 25 Apr 2025 13:14:30 +0000 (15:14 +0200)
pcim_iomap_table() and pcim_iomap_regions() have been deprecated.
Replace them with pcim_iomap_region().

Signed-off-by: Philipp Stanner <phasta@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
drivers/media/pci/solo6x10/solo6x10-core.c

index 6ec1480a6d18acdc6377214d8c4d45135a2fff86..febb2c156cf63af185c04937926f963eb71e690b 100644 (file)
@@ -477,10 +477,10 @@ static int solo_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        pci_write_config_byte(pdev, 0x40, 0x00);
        pci_write_config_byte(pdev, 0x41, 0x00);
 
-       ret = pcim_iomap_regions(pdev, BIT(0), SOLO6X10_NAME);
+       solo_dev->reg_base = pcim_iomap_region(pdev, 0, SOLO6X10_NAME);
+       ret = PTR_ERR_OR_ZERO(solo_dev->reg_base);
        if (ret)
                goto fail_probe;
-       solo_dev->reg_base = pcim_iomap_table(pdev)[0];
 
        chip_id = solo_reg_read(solo_dev, SOLO_CHIP_OPTION) &
                                SOLO_CHIP_ID_MASK;