diff options
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_glue.c')
-rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index db54c5ef2aa5..955aae4071f7 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
@@ -182,7 +182,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
182 | struct acpiphp_func *newfunc; | 182 | struct acpiphp_func *newfunc; |
183 | acpi_handle tmp; | 183 | acpi_handle tmp; |
184 | acpi_status status = AE_OK; | 184 | acpi_status status = AE_OK; |
185 | unsigned long adr, sun; | 185 | unsigned long long adr, sun; |
186 | int device, function, retval; | 186 | int device, function, retval; |
187 | 187 | ||
188 | status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr); | 188 | status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr); |
@@ -530,7 +530,7 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
530 | { | 530 | { |
531 | acpi_status status; | 531 | acpi_status status; |
532 | acpi_handle dummy_handle; | 532 | acpi_handle dummy_handle; |
533 | unsigned long tmp; | 533 | unsigned long long tmp; |
534 | int device, function; | 534 | int device, function; |
535 | struct pci_dev *dev; | 535 | struct pci_dev *dev; |
536 | struct pci_bus *pci_bus = context; | 536 | struct pci_bus *pci_bus = context; |
@@ -575,7 +575,7 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
575 | static int add_bridge(acpi_handle handle) | 575 | static int add_bridge(acpi_handle handle) |
576 | { | 576 | { |
577 | acpi_status status; | 577 | acpi_status status; |
578 | unsigned long tmp; | 578 | unsigned long long tmp; |
579 | int seg, bus; | 579 | int seg, bus; |
580 | acpi_handle dummy_handle; | 580 | acpi_handle dummy_handle; |
581 | struct pci_bus *pci_bus; | 581 | struct pci_bus *pci_bus; |
@@ -769,7 +769,7 @@ static int get_gsi_base(acpi_handle handle, u32 *gsi_base) | |||
769 | { | 769 | { |
770 | acpi_status status; | 770 | acpi_status status; |
771 | int result = -1; | 771 | int result = -1; |
772 | unsigned long gsb; | 772 | unsigned long long gsb; |
773 | struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; | 773 | struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; |
774 | union acpi_object *obj; | 774 | union acpi_object *obj; |
775 | void *table; | 775 | void *table; |
@@ -810,7 +810,7 @@ static acpi_status | |||
810 | ioapic_add(acpi_handle handle, u32 lvl, void *context, void **rv) | 810 | ioapic_add(acpi_handle handle, u32 lvl, void *context, void **rv) |
811 | { | 811 | { |
812 | acpi_status status; | 812 | acpi_status status; |
813 | unsigned long sta; | 813 | unsigned long long sta; |
814 | acpi_handle tmp; | 814 | acpi_handle tmp; |
815 | struct pci_dev *pdev; | 815 | struct pci_dev *pdev; |
816 | u32 gsi_base; | 816 | u32 gsi_base; |
@@ -874,7 +874,7 @@ static acpi_status | |||
874 | ioapic_remove(acpi_handle handle, u32 lvl, void *context, void **rv) | 874 | ioapic_remove(acpi_handle handle, u32 lvl, void *context, void **rv) |
875 | { | 875 | { |
876 | acpi_status status; | 876 | acpi_status status; |
877 | unsigned long sta; | 877 | unsigned long long sta; |
878 | acpi_handle tmp; | 878 | acpi_handle tmp; |
879 | u32 gsi_base; | 879 | u32 gsi_base; |
880 | struct acpiphp_ioapic *pos, *n, *ioapic = NULL; | 880 | struct acpiphp_ioapic *pos, *n, *ioapic = NULL; |
@@ -1266,7 +1266,7 @@ static int disable_device(struct acpiphp_slot *slot) | |||
1266 | static unsigned int get_slot_status(struct acpiphp_slot *slot) | 1266 | static unsigned int get_slot_status(struct acpiphp_slot *slot) |
1267 | { | 1267 | { |
1268 | acpi_status status; | 1268 | acpi_status status; |
1269 | unsigned long sta = 0; | 1269 | unsigned long long sta = 0; |
1270 | u32 dvid; | 1270 | u32 dvid; |
1271 | struct list_head *l; | 1271 | struct list_head *l; |
1272 | struct acpiphp_func *func; | 1272 | struct acpiphp_func *func; |