ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...)

[sfrench/cifs-2.6.git] / drivers / acpi / pci_irq.c

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 726dda1fce1cfc77edb8bf3ef3ef66a79d17f5c3..f24a610008a072a8eae5debc868bc59f10f2b0bb 100644 (file)
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -197,8 +197,8 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)
        kfree(pathname);
        status = acpi_get_irq_routing_table(handle, &buffer);
        if (status != AE_BUFFER_OVERFLOW) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PRT [%s]\n",
-                                 acpi_format_exception(status)));
+               ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRT [%s]",
+                               acpi_format_exception(status)));
                return_VALUE(-ENODEV);
        }
 
@@ -211,8 +211,8 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)
 
        status = acpi_get_irq_routing_table(handle, &buffer);
        if (ACPI_FAILURE(status)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PRT [%s]\n",
-                                 acpi_format_exception(status)));
+               ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRT [%s]",
+                               acpi_format_exception(status)));
                kfree(buffer.pointer);
                return_VALUE(-ENODEV);
        }
@@ -269,8 +269,8 @@ acpi_pci_allocate_irq(struct acpi_prt_entry *entry,
                                                 entry->link.index, triggering,
                                                 polarity, link);
                if (irq < 0) {
-                       ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                         "Invalid IRQ link routing entry\n"));
+                       printk(KERN_WARNING PREFIX
+                                     "Invalid IRQ link routing entry\n");
                        return_VALUE(-1);
                }
        } else {
@@ -361,8 +361,7 @@ acpi_pci_irq_derive(struct pci_dev *dev,
 
                if ((bridge->class >> 8) == PCI_CLASS_BRIDGE_CARDBUS) {
                        /* PC card has the same IRQ as its cardbridge */
-                       pci_read_config_byte(bridge, PCI_INTERRUPT_PIN,
-                                            &bridge_pin);
+                       bridge_pin = bridge->pin;
                        if (!bridge_pin) {
                                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                                  "No interrupt pin configured for device %s\n",
@@ -380,9 +379,8 @@ acpi_pci_irq_derive(struct pci_dev *dev,
        }
 
        if (irq < 0) {
-               ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                 "Unable to derive IRQ for device %s\n",
-                                 pci_name(dev)));
+               printk(KERN_WARNING PREFIX "Unable to derive IRQ for device %s\n",
+                             pci_name(dev));
                return_VALUE(-1);
        }
 
@@ -412,7 +410,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
        if (!dev)
                return_VALUE(-EINVAL);
 
-       pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
+       pin = dev->pin;
        if (!pin) {
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "No interrupt pin configured for device %s\n",
@@ -422,8 +420,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
        pin--;
 
        if (!dev->bus) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Invalid (NULL) 'bus' field\n"));
+               printk(KERN_ERR PREFIX "Invalid (NULL) 'bus' field\n");
                return_VALUE(-ENODEV);
        }
 
@@ -503,7 +500,7 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
        if (!dev || !dev->bus)
                return_VOID;
 
-       pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
+       pin = dev->pin;
        if (!pin)
                return_VOID;
        pin--;