diff options
Diffstat (limited to 'drivers/ide/ide-acpi.c')
-rw-r--r-- | drivers/ide/ide-acpi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index c0cf45a11b93..5cb01e5c323c 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c | |||
@@ -108,11 +108,11 @@ bool ide_port_acpi(ide_hwif_t *hwif) | |||
108 | * Returns 0 on success, <0 on error. | 108 | * Returns 0 on success, <0 on error. |
109 | */ | 109 | */ |
110 | static int ide_get_dev_handle(struct device *dev, acpi_handle *handle, | 110 | static int ide_get_dev_handle(struct device *dev, acpi_handle *handle, |
111 | acpi_integer *pcidevfn) | 111 | u64 *pcidevfn) |
112 | { | 112 | { |
113 | struct pci_dev *pdev = to_pci_dev(dev); | 113 | struct pci_dev *pdev = to_pci_dev(dev); |
114 | unsigned int bus, devnum, func; | 114 | unsigned int bus, devnum, func; |
115 | acpi_integer addr; | 115 | u64 addr; |
116 | acpi_handle dev_handle; | 116 | acpi_handle dev_handle; |
117 | acpi_status status; | 117 | acpi_status status; |
118 | struct acpi_device_info *dinfo = NULL; | 118 | struct acpi_device_info *dinfo = NULL; |
@@ -122,7 +122,7 @@ static int ide_get_dev_handle(struct device *dev, acpi_handle *handle, | |||
122 | devnum = PCI_SLOT(pdev->devfn); | 122 | devnum = PCI_SLOT(pdev->devfn); |
123 | func = PCI_FUNC(pdev->devfn); | 123 | func = PCI_FUNC(pdev->devfn); |
124 | /* ACPI _ADR encoding for PCI bus: */ | 124 | /* ACPI _ADR encoding for PCI bus: */ |
125 | addr = (acpi_integer)(devnum << 16 | func); | 125 | addr = (u64)(devnum << 16 | func); |
126 | 126 | ||
127 | DEBPRINT("ENTER: pci %02x:%02x.%01x\n", bus, devnum, func); | 127 | DEBPRINT("ENTER: pci %02x:%02x.%01x\n", bus, devnum, func); |
128 | 128 | ||
@@ -169,7 +169,7 @@ static acpi_handle ide_acpi_hwif_get_handle(ide_hwif_t *hwif) | |||
169 | { | 169 | { |
170 | struct device *dev = hwif->gendev.parent; | 170 | struct device *dev = hwif->gendev.parent; |
171 | acpi_handle uninitialized_var(dev_handle); | 171 | acpi_handle uninitialized_var(dev_handle); |
172 | acpi_integer pcidevfn; | 172 | u64 pcidevfn; |
173 | acpi_handle chan_handle; | 173 | acpi_handle chan_handle; |
174 | int err; | 174 | int err; |
175 | 175 | ||