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 a3e4705dd8f0..3baee56fa81a 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
@@ -180,7 +180,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
180 | struct acpiphp_func *newfunc; | 180 | struct acpiphp_func *newfunc; |
181 | acpi_handle tmp; | 181 | acpi_handle tmp; |
182 | acpi_status status = AE_OK; | 182 | acpi_status status = AE_OK; |
183 | unsigned long adr, sun; | 183 | unsigned long long adr, sun; |
184 | int device, function, retval; | 184 | int device, function, retval; |
185 | 185 | ||
186 | status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr); | 186 | status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr); |
@@ -528,7 +528,7 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
528 | { | 528 | { |
529 | acpi_status status; | 529 | acpi_status status; |
530 | acpi_handle dummy_handle; | 530 | acpi_handle dummy_handle; |
531 | unsigned long tmp; | 531 | unsigned long long tmp; |
532 | int device, function; | 532 | int device, function; |
533 | struct pci_dev *dev; | 533 | struct pci_dev *dev; |
534 | struct pci_bus *pci_bus = context; | 534 | struct pci_bus *pci_bus = context; |
@@ -573,7 +573,7 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
573 | static int add_bridge(acpi_handle handle) | 573 | static int add_bridge(acpi_handle handle) |
574 | { | 574 | { |
575 | acpi_status status; | 575 | acpi_status status; |
576 | unsigned long tmp; | 576 | unsigned long long tmp; |
577 | int seg, bus; | 577 | int seg, bus; |
578 | acpi_handle dummy_handle; | 578 | acpi_handle dummy_handle; |
579 | struct pci_bus *pci_bus; | 579 | struct pci_bus *pci_bus; |
@@ -767,7 +767,7 @@ static int get_gsi_base(acpi_handle handle, u32 *gsi_base) | |||
767 | { | 767 | { |
768 | acpi_status status; | 768 | acpi_status status; |
769 | int result = -1; | 769 | int result = -1; |
770 | unsigned long gsb; | 770 | unsigned long long gsb; |
771 | struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; | 771 | struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; |
772 | union acpi_object *obj; | 772 | union acpi_object *obj; |
773 | void *table; | 773 | void *table; |
@@ -808,7 +808,7 @@ static acpi_status | |||
808 | ioapic_add(acpi_handle handle, u32 lvl, void *context, void **rv) | 808 | ioapic_add(acpi_handle handle, u32 lvl, void *context, void **rv) |
809 | { | 809 | { |
810 | acpi_status status; | 810 | acpi_status status; |
811 | unsigned long sta; | 811 | unsigned long long sta; |
812 | acpi_handle tmp; | 812 | acpi_handle tmp; |
813 | struct pci_dev *pdev; | 813 | struct pci_dev *pdev; |
814 | u32 gsi_base; | 814 | u32 gsi_base; |
@@ -872,7 +872,7 @@ static acpi_status | |||
872 | ioapic_remove(acpi_handle handle, u32 lvl, void *context, void **rv) | 872 | ioapic_remove(acpi_handle handle, u32 lvl, void *context, void **rv) |
873 | { | 873 | { |
874 | acpi_status status; | 874 | acpi_status status; |
875 | unsigned long sta; | 875 | unsigned long long sta; |
876 | acpi_handle tmp; | 876 | acpi_handle tmp; |
877 | u32 gsi_base; | 877 | u32 gsi_base; |
878 | struct acpiphp_ioapic *pos, *n, *ioapic = NULL; | 878 | struct acpiphp_ioapic *pos, *n, *ioapic = NULL; |
@@ -1264,7 +1264,7 @@ static int disable_device(struct acpiphp_slot *slot) | |||
1264 | static unsigned int get_slot_status(struct acpiphp_slot *slot) | 1264 | static unsigned int get_slot_status(struct acpiphp_slot *slot) |
1265 | { | 1265 | { |
1266 | acpi_status status; | 1266 | acpi_status status; |
1267 | unsigned long sta = 0; | 1267 | unsigned long long sta = 0; |
1268 | u32 dvid; | 1268 | u32 dvid; |
1269 | struct list_head *l; | 1269 | struct list_head *l; |
1270 | struct acpiphp_func *func; | 1270 | struct acpiphp_func *func; |