This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / acpi / pci_link.c

diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index bc72416..86e8a0c 100644 (file)
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -110,13 +110,13 @@ acpi_pci_link_check_possible (
 
        switch (resource->id) {
        case ACPI_RSTYPE_START_DPF:
-               return_ACPI_STATUS(AE_OK);
+               return AE_OK;
        case ACPI_RSTYPE_IRQ:
        {
                struct acpi_resource_irq *p = &resource->data.irq;
                if (!p || !p->number_of_interrupts) {
                        ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Blank IRQ resource\n"));
-                       return_ACPI_STATUS(AE_OK);
+                       return AE_OK;
                }
                for (i = 0; (i<p->number_of_interrupts && i<ACPI_PCI_LINK_MAX_POSSIBLE); i++) {
                        if (!p->interrupts[i]) {
@@ -137,7 +137,7 @@ acpi_pci_link_check_possible (
                if (!p || !p->number_of_interrupts) {
                        ACPI_DEBUG_PRINT((ACPI_DB_WARN, 
                                "Blank EXT IRQ resource\n"));
-                       return_ACPI_STATUS(AE_OK);
+                       return AE_OK;
                }
                for (i = 0; (i<p->number_of_interrupts && i<ACPI_PCI_LINK_MAX_POSSIBLE); i++) {
                        if (!p->interrupts[i]) {
@@ -155,10 +155,10 @@ acpi_pci_link_check_possible (
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
                        "Resource is not an IRQ entry\n"));
-               return_ACPI_STATUS(AE_OK);
+               return AE_OK;
        }
 
-       return_ACPI_STATUS(AE_CTRL_TERMINATE);
+       return AE_CTRL_TERMINATE;
 }
 
 
@@ -207,7 +207,7 @@ acpi_pci_link_check_current (
                         */
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                "Blank IRQ resource\n")); 
-                       return_ACPI_STATUS(AE_OK);
+                       return AE_OK;
                }
                *irq = p->interrupts[0];
                break;
@@ -222,7 +222,7 @@ acpi_pci_link_check_current (
                         */
                        ACPI_DEBUG_PRINT((ACPI_DB_WARN,
                                "Blank EXT IRQ resource\n"));
-                       return_ACPI_STATUS(AE_OK);
+                       return AE_OK;
                }
                *irq = p->interrupts[0];
                break;
@@ -230,9 +230,9 @@ acpi_pci_link_check_current (
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                        "Resource isn't an IRQ\n"));
-               return_ACPI_STATUS(AE_OK);
+               return AE_OK;
        }
-       return_ACPI_STATUS(AE_CTRL_TERMINATE);
+       return AE_CTRL_TERMINATE;
 }
 
 /*
@@ -577,11 +577,6 @@ static int acpi_pci_link_allocate(struct acpi_pci_link* link) {
        return_VALUE(0);
 }
 
-/*
- * acpi_pci_link_get_irq
- * success: return IRQ >= 0
- * failure: return -1
- */
 
 int
 acpi_pci_link_get_irq (
@@ -599,27 +594,27 @@ acpi_pci_link_get_irq (
        result = acpi_bus_get_device(handle, &device);
        if (result) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid link device\n"));
-               return_VALUE(-1);
+               return_VALUE(0);
        }
 
        link = (struct acpi_pci_link *) acpi_driver_data(device);
        if (!link) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid link context\n"));
-               return_VALUE(-1);
+               return_VALUE(0);
        }
 
        /* TBD: Support multiple index (IRQ) entries per Link Device */
        if (index) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid index %d\n", index));
-               return_VALUE(-1);
+               return_VALUE(0);
        }
 
        if (acpi_pci_link_allocate(link))
-               return_VALUE(-1);
+               return_VALUE(0);
           
        if (!link->irq.active) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Link active IRQ is 0!\n"));
-               return_VALUE(-1);
+               return_VALUE(0);
        }
 
        if (edge_level) *edge_level = link->irq.edge_level;
@@ -791,18 +786,6 @@ static int __init acpi_irq_penalty_update(char *str, int used)
        return 1;
 }
 
-/*
- * We'd like PNP to call this routine for the
- * single ISA_USED value for each legacy device.
- * But instead it calls us with each POSSIBLE setting.
- * There is no ISA_POSSIBLE weight, so we simply use
- * the (small) PCI_USING penalty.
- */
-void acpi_penalize_isa_irq(int irq)
-{
-       acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;
-}
-
 /*
  * Over-ride default table to reserve additional IRQs for use by ISA
  * e.g. acpi_irq_isa=5
@@ -828,14 +811,14 @@ __setup("acpi_irq_pci=", acpi_irq_pci);
 static int __init acpi_irq_nobalance_set(char *str)
 {
        acpi_irq_balance = 0;
-       return 1;
+       return(1);
 }
 __setup("acpi_irq_nobalance", acpi_irq_nobalance_set);
 
 int __init acpi_irq_balance_set(char *str)
 {
        acpi_irq_balance = 1;
-       return 1;
+       return(1);
 }
 __setup("acpi_irq_balance", acpi_irq_balance_set);