drm/nouveau: remove open-coded version of remove_conflicting_pci_framebuffers()

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index ca4087f5a15b6c043ddc5245c722dc32049fda3c..eb10c80ed853ae7a87e7c30f785ec334809b4c5e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -681,8 +681,6 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
 {
        struct nvkm_device *device;
        struct drm_device *drm_dev;
-       struct apertures_struct *aper;
-       bool boot = false;
        int ret;
 
        if (vga_switcheroo_client_probe_defer(pdev))
@@ -699,32 +697,9 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
        nvkm_device_del(&device);
 
        /* Remove conflicting drivers (vesafb, efifb etc). */
-       aper = alloc_apertures(3);
-       if (!aper)
-               return -ENOMEM;
-
-       aper->ranges[0].base = pci_resource_start(pdev, 1);
-       aper->ranges[0].size = pci_resource_len(pdev, 1);
-       aper->count = 1;
-
-       if (pci_resource_len(pdev, 2)) {
-               aper->ranges[aper->count].base = pci_resource_start(pdev, 2);
-               aper->ranges[aper->count].size = pci_resource_len(pdev, 2);
-               aper->count++;
-       }
-
-       if (pci_resource_len(pdev, 3)) {
-               aper->ranges[aper->count].base = pci_resource_start(pdev, 3);
-               aper->ranges[aper->count].size = pci_resource_len(pdev, 3);
-               aper->count++;
-       }
-
-#ifdef CONFIG_X86
-       boot = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
-#endif
-       if (nouveau_modeset != 2)
-               drm_fb_helper_remove_conflicting_framebuffers(aper, "nouveaufb", boot);
-       kfree(aper);
+       ret = remove_conflicting_pci_framebuffers(pdev, "nouveaufb");
+       if (ret)
+               return ret;
 
        ret = nvkm_device_pci_new(pdev, nouveau_config, nouveau_debug,
                                  true, true, ~0ULL, &device);