staging/lynxfb: Use pci aperture helper
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 11 Jan 2023 15:41:07 +0000 (16:41 +0100)
committerThomas Zimmermann <tzimmermann@suse.de>
Tue, 4 Apr 2023 12:55:55 +0000 (14:55 +0200)
It exists! Note that since this is an exact copy, there shouldn't be
any functional difference here.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Teddy Wang <teddy.wang@siliconmotion.com>
Cc: linux-fbdev@vger.kernel.org
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230111154112.90575-6-daniel.vetter@ffwll.ch
drivers/staging/sm750fb/sm750.c

index effc7fc..22ace31 100644 (file)
@@ -989,20 +989,6 @@ release_fb:
        return err;
 }
 
-static int lynxfb_kick_out_firmware_fb(struct pci_dev *pdev)
-{
-       resource_size_t base = pci_resource_start(pdev, 0);
-       resource_size_t size = pci_resource_len(pdev, 0);
-       bool primary = false;
-
-#ifdef CONFIG_X86
-       primary = pdev->resource[PCI_ROM_RESOURCE].flags &
-                                       IORESOURCE_ROM_SHADOW;
-#endif
-
-       return aperture_remove_conflicting_devices(base, size, primary, "sm750_fb1");
-}
-
 static int lynxfb_pci_probe(struct pci_dev *pdev,
                            const struct pci_device_id *ent)
 {
@@ -1011,7 +997,7 @@ static int lynxfb_pci_probe(struct pci_dev *pdev,
        int fbidx;
        int err;
 
-       err = lynxfb_kick_out_firmware_fb(pdev);
+       err = aperture_remove_conflicting_pci_devices(pdev, "sm750_fb1");
        if (err)
                return err;