Merge tag 'iomap-5.5-merge-13' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-block.git] / drivers / video / fbdev / core / fbmem.c

diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index e6a1c805064f07c8ae2499c3a2f9e0a069546999..95c32952fa8a5702c1d744402bf2dc67b7f7f2b8 100644 (file)
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1758,21 +1758,19 @@ EXPORT_SYMBOL(remove_conflicting_framebuffers);
 /**
  * remove_conflicting_pci_framebuffers - remove firmware-configured framebuffers for PCI devices
  * @pdev: PCI device
- * @res_id: index of PCI BAR configuring framebuffer memory
  * @name: requesting driver name
  *
  * This function removes framebuffer devices (eg. initialized by firmware)
- * using memory range configured for @pdev's BAR @res_id.
+ * using memory range configured for any of @pdev's memory bars.
  *
  * The function assumes that PCI device with shadowed ROM drives a primary
  * display and so kicks out vga16fb.
  */
-int remove_conflicting_pci_framebuffers(struct pci_dev *pdev, int res_id, const char *name)
+int remove_conflicting_pci_framebuffers(struct pci_dev *pdev, const char *name)
 {
        struct apertures_struct *ap;
        bool primary = false;
        int err, idx, bar;
-       bool res_id_found = false;
 
        for (idx = 0, bar = 0; bar < PCI_ROM_RESOURCE; bar++) {
                if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM))
@@ -1789,16 +1787,11 @@ int remove_conflicting_pci_framebuffers(struct pci_dev *pdev, int res_id, const
                        continue;
                ap->ranges[idx].base = pci_resource_start(pdev, bar);
                ap->ranges[idx].size = pci_resource_len(pdev, bar);
-               pci_info(pdev, "%s: bar %d: 0x%lx -> 0x%lx\n", __func__, bar,
-                        (unsigned long)pci_resource_start(pdev, bar),
-                        (unsigned long)pci_resource_end(pdev, bar));
+               pci_dbg(pdev, "%s: bar %d: 0x%lx -> 0x%lx\n", __func__, bar,
+                       (unsigned long)pci_resource_start(pdev, bar),
+                       (unsigned long)pci_resource_end(pdev, bar));
                idx++;
-               if (res_id == bar)
-                       res_id_found = true;
        }
-       if (!res_id_found)
-               pci_warn(pdev, "%s: passed res_id (%d) is not a memory bar\n",
-                        __func__, res_id);
 
 #ifdef CONFIG_X86
        primary = pdev->resource[PCI_ROM_RESOURCE].flags &