Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
	arch/Kconfig
	kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
              ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 12 deletions

diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 54d77cbb8b39..9a1c423ad167 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -53,12 +53,8 @@ static DEFINE_MUTEX(pci_scan_mutex);
 
 void __devinit register_pci_controller(struct pci_channel *hose)
 {
-        if (request_resource(&iomem_resource, hose->mem_resource) < 0)
-                goto out;
-        if (request_resource(&ioport_resource, hose->io_resource) < 0) {
-                release_resource(hose->mem_resource);
-                goto out;
-        }
+        request_resource(&iomem_resource, hose->mem_resource);
+        request_resource(&ioport_resource, hose->io_resource);
 
         *hose_tail = hose;
         hose_tail = &hose->next;
@@ -80,12 +76,6 @@ void __devinit register_pci_controller(struct pci_channel *hose)
                 pcibios_scanbus(hose);
                 mutex_unlock(&pci_scan_mutex);
         }
-
-        return;
-
-out:
-        printk(KERN_WARNING
-               "Skipping PCI bus scan due to resource conflict\n");
 }
 
 static int __init pcibios_init(void)