diff options
Diffstat (limited to 'drivers/pci/hotplug')
-rw-r--r-- | drivers/pci/hotplug/acpi_pcihp.c | 16 | ||||
-rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/pciehp_hpc.c | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c index 39af9c325f35..64cb30d7fc9a 100644 --- a/drivers/pci/hotplug/acpi_pcihp.c +++ b/drivers/pci/hotplug/acpi_pcihp.c | |||
@@ -58,7 +58,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp) | |||
58 | if (!ret_buf.pointer) { | 58 | if (!ret_buf.pointer) { |
59 | printk(KERN_ERR "%s:%s alloc for _HPP fail\n", | 59 | printk(KERN_ERR "%s:%s alloc for _HPP fail\n", |
60 | __FUNCTION__, (char *)string.pointer); | 60 | __FUNCTION__, (char *)string.pointer); |
61 | acpi_os_free(string.pointer); | 61 | kfree(string.pointer); |
62 | return AE_NO_MEMORY; | 62 | return AE_NO_MEMORY; |
63 | } | 63 | } |
64 | status = acpi_evaluate_object(handle, METHOD_NAME__HPP, | 64 | status = acpi_evaluate_object(handle, METHOD_NAME__HPP, |
@@ -69,7 +69,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp) | |||
69 | if (ACPI_FAILURE(status)) { | 69 | if (ACPI_FAILURE(status)) { |
70 | pr_debug("%s:%s _HPP fail=0x%x\n", __FUNCTION__, | 70 | pr_debug("%s:%s _HPP fail=0x%x\n", __FUNCTION__, |
71 | (char *)string.pointer, status); | 71 | (char *)string.pointer, status); |
72 | acpi_os_free(string.pointer); | 72 | kfree(string.pointer); |
73 | return status; | 73 | return status; |
74 | } | 74 | } |
75 | } | 75 | } |
@@ -109,8 +109,8 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp) | |||
109 | pr_debug(" _HPP: enable PERR =0x%x\n", hpp->enable_perr); | 109 | pr_debug(" _HPP: enable PERR =0x%x\n", hpp->enable_perr); |
110 | 110 | ||
111 | free_and_return: | 111 | free_and_return: |
112 | acpi_os_free(string.pointer); | 112 | kfree(string.pointer); |
113 | acpi_os_free(ret_buf.pointer); | 113 | kfree(ret_buf.pointer); |
114 | return status; | 114 | return status; |
115 | } | 115 | } |
116 | 116 | ||
@@ -136,7 +136,7 @@ acpi_status acpi_run_oshp(acpi_handle handle) | |||
136 | pr_debug("%s:%s OSHP passes\n", __FUNCTION__, | 136 | pr_debug("%s:%s OSHP passes\n", __FUNCTION__, |
137 | (char *)string.pointer); | 137 | (char *)string.pointer); |
138 | 138 | ||
139 | acpi_os_free(string.pointer); | 139 | kfree(string.pointer); |
140 | return status; | 140 | return status; |
141 | } | 141 | } |
142 | EXPORT_SYMBOL_GPL(acpi_run_oshp); | 142 | EXPORT_SYMBOL_GPL(acpi_run_oshp); |
@@ -192,19 +192,19 @@ int acpi_root_bridge(acpi_handle handle) | |||
192 | if ((info->valid & ACPI_VALID_HID) && | 192 | if ((info->valid & ACPI_VALID_HID) && |
193 | !strcmp(PCI_ROOT_HID_STRING, | 193 | !strcmp(PCI_ROOT_HID_STRING, |
194 | info->hardware_id.value)) { | 194 | info->hardware_id.value)) { |
195 | acpi_os_free(buffer.pointer); | 195 | kfree(buffer.pointer); |
196 | return 1; | 196 | return 1; |
197 | } | 197 | } |
198 | if (info->valid & ACPI_VALID_CID) { | 198 | if (info->valid & ACPI_VALID_CID) { |
199 | for (i=0; i < info->compatibility_id.count; i++) { | 199 | for (i=0; i < info->compatibility_id.count; i++) { |
200 | if (!strcmp(PCI_ROOT_HID_STRING, | 200 | if (!strcmp(PCI_ROOT_HID_STRING, |
201 | info->compatibility_id.id[i].value)) { | 201 | info->compatibility_id.id[i].value)) { |
202 | acpi_os_free(buffer.pointer); | 202 | kfree(buffer.pointer); |
203 | return 1; | 203 | return 1; |
204 | } | 204 | } |
205 | } | 205 | } |
206 | } | 206 | } |
207 | acpi_os_free(buffer.pointer); | 207 | kfree(buffer.pointer); |
208 | } | 208 | } |
209 | return 0; | 209 | return 0; |
210 | } | 210 | } |
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 610a530232ff..2a83e6bdab6a 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
@@ -715,7 +715,7 @@ static int get_gsi_base(acpi_handle handle, u32 *gsi_base) | |||
715 | break; | 715 | break; |
716 | } | 716 | } |
717 | out: | 717 | out: |
718 | acpi_os_free(buffer.pointer); | 718 | kfree(buffer.pointer); |
719 | return result; | 719 | return result; |
720 | } | 720 | } |
721 | 721 | ||
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 6c14d9e46b2e..7f459dfeadd3 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c | |||
@@ -1288,7 +1288,7 @@ int pciehp_acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev) | |||
1288 | if (ACPI_SUCCESS(status)) { | 1288 | if (ACPI_SUCCESS(status)) { |
1289 | dbg("Gained control for hotplug HW for pci %s (%s)\n", | 1289 | dbg("Gained control for hotplug HW for pci %s (%s)\n", |
1290 | pci_name(dev), (char *)string.pointer); | 1290 | pci_name(dev), (char *)string.pointer); |
1291 | acpi_os_free(string.pointer); | 1291 | kfree(string.pointer); |
1292 | return 0; | 1292 | return 0; |
1293 | } | 1293 | } |
1294 | if (acpi_root_bridge(handle)) | 1294 | if (acpi_root_bridge(handle)) |
@@ -1302,7 +1302,7 @@ int pciehp_acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev) | |||
1302 | err("Cannot get control of hotplug hardware for pci %s\n", | 1302 | err("Cannot get control of hotplug hardware for pci %s\n", |
1303 | pci_name(dev)); | 1303 | pci_name(dev)); |
1304 | 1304 | ||
1305 | acpi_os_free(string.pointer); | 1305 | kfree(string.pointer); |
1306 | return -1; | 1306 | return -1; |
1307 | } | 1307 | } |
1308 | #endif | 1308 | #endif |