Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / xtensa / lib / pci-auto.c

diff --git a/arch/xtensa/lib/pci-auto.c b/arch/xtensa/lib/pci-auto.c
index 34d05abbd921a397d2335f6618f5da36d9807147..a2b558161d6d721685e41e54f081326be801426d 100644 (file)
--- a/arch/xtensa/lib/pci-auto.c
+++ b/arch/xtensa/lib/pci-auto.c
@@ -49,17 +49,6 @@
  *
  */
 
-
-/* define DEBUG to print some debugging messages. */
-
-#undef DEBUG
-
-#ifdef DEBUG
-# define DBG(x...) printk(x)
-#else
-# define DBG(x...)
-#endif
-
 static int pciauto_upper_iospc;
 static int pciauto_upper_memspc;
 
@@ -97,7 +86,7 @@ pciauto_setup_bars(struct pci_dev *dev, int bar_limit)
                {
                        bar_size &= PCI_BASE_ADDRESS_IO_MASK;
                        upper_limit = &pciauto_upper_iospc;
-                       DBG("PCI Autoconfig: BAR %d, I/O, ", bar_nr);
+                       pr_debug("PCI Autoconfig: BAR %d, I/O, ", bar_nr);
                }
                else
                {
@@ -107,7 +96,7 @@ pciauto_setup_bars(struct pci_dev *dev, int bar_limit)
 
                        bar_size &= PCI_BASE_ADDRESS_MEM_MASK;
                        upper_limit = &pciauto_upper_memspc;
-                       DBG("PCI Autoconfig: BAR %d, Mem, ", bar_nr);
+                       pr_debug("PCI Autoconfig: BAR %d, Mem, ", bar_nr);
                }
 
                /* Allocate a base address (bar_size is negative!) */
@@ -125,7 +114,8 @@ pciauto_setup_bars(struct pci_dev *dev, int bar_limit)
                if (found_mem64)
                        pci_write_config_dword(dev, (bar+=4), 0x00000000);
 
-               DBG("size=0x%x, address=0x%x\n", ~bar_size + 1, *upper_limit);
+               pr_debug("size=0x%x, address=0x%x\n",
+                        ~bar_size + 1, *upper_limit);
        }
 }
 
@@ -150,7 +140,7 @@ pciauto_setup_irq(struct pci_controller* pci_ctrl,struct pci_dev *dev,int devfn)
        if (irq == -1)
                irq = 0;
 
-       DBG("PCI Autoconfig: Interrupt %d, pin %d\n", irq, pin);
+       pr_debug("PCI Autoconfig: Interrupt %d, pin %d\n", irq, pin);
 
        pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
 }
@@ -289,8 +279,8 @@ int __init pciauto_bus_scan(struct pci_controller *pci_ctrl, int current_bus)
 
                        int iosave, memsave;
 
-                       DBG("PCI Autoconfig: Found P2P bridge, device %d\n",
-                           PCI_SLOT(pci_devfn));
+                       pr_debug("PCI Autoconfig: Found P2P bridge, device %d\n",
+                                PCI_SLOT(pci_devfn));
 
                        /* Allocate PCI I/O and/or memory space */
                        pciauto_setup_bars(dev, PCI_BASE_ADDRESS_1);
@@ -306,23 +296,6 @@ int __init pciauto_bus_scan(struct pci_controller *pci_ctrl, int current_bus)
 
                }
 
-
-#if 0
-               /* Skip legacy mode IDE controller */
-
-               if ((pci_class >> 16) == PCI_CLASS_STORAGE_IDE) {
-
-                       unsigned char prg_iface;
-                       pci_read_config_byte(dev, PCI_CLASS_PROG, &prg_iface);
-
-                       if (!(prg_iface & PCIAUTO_IDE_MODE_MASK)) {
-                               DBG("PCI Autoconfig: Skipping legacy mode "
-                                   "IDE controller\n");
-                               continue;
-                       }
-               }
-#endif
-
                /*
                 * Found a peripheral, enable some standard
                 * settings
@@ -337,8 +310,8 @@ int __init pciauto_bus_scan(struct pci_controller *pci_ctrl, int current_bus)
                pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x80);
 
                /* Allocate PCI I/O and/or memory space */
-               DBG("PCI Autoconfig: Found Bus %d, Device %d, Function %d\n",
-                   current_bus, PCI_SLOT(pci_devfn), PCI_FUNC(pci_devfn) );
+               pr_debug("PCI Autoconfig: Found Bus %d, Device %d, Function %d\n",
+                        current_bus, PCI_SLOT(pci_devfn), PCI_FUNC(pci_devfn));
 
                pciauto_setup_bars(dev, PCI_BASE_ADDRESS_5);
                pciauto_setup_irq(pci_ctrl, dev, pci_devfn);