sh: pci: Consolidate pcibios_setup() in pci-lib.

This wasn't really being used for anything useful, so just stub it in
pci-lib.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

4 files changed, 16 insertions, 35 deletions

diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c
index 5bc81d5b660a..529aa4f27a89 100644
--- a/arch/sh/drivers/pci/ops-dreamcast.c
+++ b/arch/sh/drivers/pci/ops-dreamcast.c
@@ -154,12 +154,6 @@ static int __init gapspci_init(struct pci_channel *chan)
         return 0;
 }
 
-/* Haven't done anything here as yet */
-char * __devinit pcibios_setup(char *str)
-{
-        return str;
-}
-
 struct pci_channel board_pci_channels[] = {
         { gapspci_init, &gapspci_pci_ops, &gapspci_io_resource,
           &gapspci_mem_resource, 0, 1 },
diff --git a/arch/sh/drivers/pci/ops-sh4.c b/arch/sh/drivers/pci/ops-sh4.c
index 2a7f7b50ff0a..7cc1fccf1c52 100644
--- a/arch/sh/drivers/pci/ops-sh4.c
+++ b/arch/sh/drivers/pci/ops-sh4.c
@@ -106,30 +106,27 @@ struct pci_ops sh4_pci_ops = {
  * Not really related to pci_ops, but it's common and not worth shoving
  * somewhere else for now..
  */
-static unsigned int pci_probe = PCI_PROBE_CONF1;
-
 int __init sh4_pci_check_direct(struct pci_channel *chan)
 {
         /*
          * Check if configuration works.
          */
-        if (pci_probe & PCI_PROBE_CONF1) {
-                unsigned int tmp = pci_read_reg(chan, SH4_PCIPAR);
-
-                pci_write_reg(chan, P1SEG, SH4_PCIPAR);
+        unsigned int tmp = pci_read_reg(chan, SH4_PCIPAR);
 
-                if (pci_read_reg(chan, SH4_PCIPAR) == P1SEG) {
-                        pci_write_reg(chan, tmp, SH4_PCIPAR);
-                        printk(KERN_INFO "PCI: Using configuration type 1\n");
-                        request_region(chan->reg_base + SH4_PCIPAR, 8,
-                                       "PCI conf1");
-                        return 0;
-                }
+        pci_write_reg(chan, P1SEG, SH4_PCIPAR);
 
+        if (pci_read_reg(chan, SH4_PCIPAR) == P1SEG) {
                 pci_write_reg(chan, tmp, SH4_PCIPAR);
+                printk(KERN_INFO "PCI: Using configuration type 1\n");
+                request_region(chan->reg_base + SH4_PCIPAR, 8,
+                               "PCI conf1");
+                return 0;
         }
 
-        pr_debug("PCI: pci_check_direct failed\n");
+        pci_write_reg(chan, tmp, SH4_PCIPAR);
+
+        printk(KERN_ERR "PCI: %s failed\n", __func__);
+
         return -EINVAL;
 }
 
@@ -155,16 +152,6 @@ static void __init pci_fixup_ide_bases(struct pci_dev *d)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
 
-char * __devinit pcibios_setup(char *str)
-{
-        if (!strcmp(str, "off")) {
-                pci_probe = 0;
-                return NULL;
-        }
-
-        return str;
-}
-
 int __attribute__((weak)) pci_fixup_pcic(struct pci_channel *chan)
 {
         /* Nothing to do. */
diff --git a/arch/sh/drivers/pci/ops-sh5.c b/arch/sh/drivers/pci/ops-sh5.c
index 729e38a6fe07..b10e2d5f4251 100644
--- a/arch/sh/drivers/pci/ops-sh5.c
+++ b/arch/sh/drivers/pci/ops-sh5.c
@@ -42,11 +42,6 @@ static void __init pci_fixup_ide_bases(struct pci_dev *d)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
 
-char * __devinit pcibios_setup(char *str)
-{
-        return str;
-}
-
 static int sh5pci_read(struct pci_bus *bus, unsigned int devfn, int where,
                         int size, u32 *val)
 {
diff --git a/arch/sh/drivers/pci/pci-lib.c b/arch/sh/drivers/pci/pci-lib.c
index ea8362945849..f072acafce6c 100644
--- a/arch/sh/drivers/pci/pci-lib.c
+++ b/arch/sh/drivers/pci/pci-lib.c
@@ -134,6 +134,11 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq)
         pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
 }
 
+char * __devinit pcibios_setup(char *str)
+{
+        return str;
+}
+
 int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                         enum pci_mmap_state mmap_state, int write_combine)
 {