4 files changed, 24 insertions, 24 deletions

diff --git a/arch/ia64/kernel/acpi-ext.c b/arch/ia64/kernel/acpi-ext.c
index a146016d7ad7..4a5574ff007b 100644
--- a/arch/ia64/kernel/acpi-ext.c
+++ b/arch/ia64/kernel/acpi-ext.c
@@ -33,33 +33,33 @@ acpi_vendor_resource_match(struct acpi_resource *resource, void *context)
         struct acpi_vendor_info *info = (struct acpi_vendor_info *)context;
         struct acpi_resource_vendor *vendor;
         struct acpi_vendor_descriptor *descriptor;
-        u32 length;
+        u32 byte_length;
 
-        if (resource->type != ACPI_RSTYPE_VENDOR)
+        if (resource->type != ACPI_RESOURCE_TYPE_VENDOR)
                 return AE_OK;
 
         vendor = (struct acpi_resource_vendor *)&resource->data;
-        descriptor = (struct acpi_vendor_descriptor *)vendor->reserved;
-        if (vendor->length <= sizeof(*info->descriptor) ||
+        descriptor = (struct acpi_vendor_descriptor *)vendor->byte_data;
+        if (vendor->byte_length <= sizeof(*info->descriptor) ||
             descriptor->guid_id != info->descriptor->guid_id ||
             efi_guidcmp(descriptor->guid, info->descriptor->guid))
                 return AE_OK;
 
-        length = vendor->length - sizeof(struct acpi_vendor_descriptor);
-        info->data = acpi_os_allocate(length);
+        byte_length = vendor->byte_length - sizeof(struct acpi_vendor_descriptor);
+        info->data = acpi_os_allocate(byte_length);
         if (!info->data)
                 return AE_NO_MEMORY;
 
         memcpy(info->data,
-               vendor->reserved + sizeof(struct acpi_vendor_descriptor),
-               length);
-        info->length = length;
+               vendor->byte_data + sizeof(struct acpi_vendor_descriptor),
+               byte_length);
+        info->length = byte_length;
         return AE_CTRL_TERMINATE;
 }
 
 acpi_status
 acpi_find_vendor_resource(acpi_handle obj, struct acpi_vendor_descriptor * id,
-                          u8 ** data, u32 * length)
+                          u8 ** data, u32 * byte_length)
 {
         struct acpi_vendor_info info;
 
@@ -72,7 +72,7 @@ acpi_find_vendor_resource(acpi_handle obj, struct acpi_vendor_descriptor * id,
                 return AE_NOT_FOUND;
 
         *data = info.data;
-        *length = info.length;
+        *byte_length = info.length;
         return AE_OK;
 }
 
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 20d76fae24e8..25f923d050e3 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -193,12 +193,12 @@ add_io_space (struct pci_root_info *info, struct acpi_resource_address64 *addr)
                 goto free_resource;
         }
 
-        min = addr->min_address_range;
+        min = addr->minimum;
         max = min + addr->address_length - 1;
         if (addr->attribute.io.translation_attribute == ACPI_SPARSE_TRANSLATION)
                 sparse = 1;
 
-        space_nr = new_space(addr->address_translation_offset, sparse);
+        space_nr = new_space(addr->translation_offset, sparse);
         if (space_nr == ~0)
                 goto free_name;
 
@@ -285,7 +285,7 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)
         if (addr.resource_type == ACPI_MEMORY_RANGE) {
                 flags = IORESOURCE_MEM;
                 root = &iomem_resource;
-                offset = addr.address_translation_offset;
+                offset = addr.translation_offset;
         } else if (addr.resource_type == ACPI_IO_RANGE) {
                 flags = IORESOURCE_IO;
                 root = &ioport_resource;
@@ -298,7 +298,7 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)
         window = &info->controller->window[info->controller->windows++];
         window->resource.name = info->name;
         window->resource.flags = flags;
-        window->resource.start = addr.min_address_range + offset;
+        window->resource.start = addr.minimum + offset;
         window->resource.end = window->resource.start + addr.address_length - 1;
         window->resource.child = NULL;
         window->offset = offset;
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index 97154ab058b4..619767d3ea2b 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -1956,7 +1956,7 @@ int __init io_apic_get_redir_entries (int ioapic)
 }
 
 
-int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low)
+int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int polarity)
 {
         struct IO_APIC_route_entry entry;
         unsigned long flags;
@@ -1978,8 +1978,8 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
         entry.delivery_mode = INT_DELIVERY_MODE;
         entry.dest_mode = INT_DEST_MODE;
         entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
-        entry.trigger = edge_level;
-        entry.polarity = active_high_low;
+        entry.trigger = triggering;
+        entry.polarity = polarity;
         entry.mask = 1;                                  /* Disabled (masked) */
 
         irq = gsi_irq_sharing(irq);
@@ -1994,9 +1994,9 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
         apic_printk(APIC_VERBOSE,KERN_DEBUG "IOAPIC[%d]: Set PCI routing entry (%d-%d -> 0x%x -> "
                 "IRQ %d Mode:%i Active:%i)\n", ioapic, 
                mp_ioapics[ioapic].mpc_apicid, pin, entry.vector, irq,
-               edge_level, active_high_low);
+               triggering, polarity);
 
-        ioapic_register_intr(irq, entry.vector, edge_level);
+        ioapic_register_intr(irq, entry.vector, triggering);
 
         if (!ioapic && (irq < 16))
                 disable_8259A_irq(irq);
diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
index 1105250bf02c..ba817e7454b2 100644
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
@@ -915,7 +915,7 @@ void __init mp_config_acpi_legacy_irqs (void)
 
 #define MAX_GSI_NUM     4096
 
-int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
+int mp_register_gsi(u32 gsi, int triggering, int polarity)
 {
         int                     ioapic = -1;
         int                     ioapic_pin = 0;
@@ -964,7 +964,7 @@ int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
 
         mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit);
 
-        if (edge_level) {
+        if (triggering) {
                 /*
                  * For PCI devices assign IRQs in order, avoiding gaps
                  * due to unused I/O APIC pins.
@@ -986,8 +986,8 @@ int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
         }
 
         io_apic_set_pci_routing(ioapic, ioapic_pin, gsi,
-                edge_level == ACPI_EDGE_SENSITIVE ? 0 : 1,
-                active_high_low == ACPI_ACTIVE_HIGH ? 0 : 1);
+                triggering == ACPI_EDGE_SENSITIVE ? 0 : 1,
+                polarity == ACPI_ACTIVE_HIGH ? 0 : 1);
         return gsi;
 }