It exists! Note that since this is an exact copy, there shouldn't be
any functional difference here.

Signed-off-by: Daniel Vetter <[email protected]>
Cc: Sudip Mukherjee <[email protected]>
Cc: Teddy Wang <[email protected]>
Cc: [email protected]
---
 drivers/staging/sm750fb/sm750.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index effc7fcc3703..22ace3168723 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -989,20 +989,6 @@ static int sm750fb_framebuffer_alloc(struct sm750_dev 
*sm750_dev, int fbidx)
        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;
 
-- 
2.39.0

Reply via email to