|
@@ -38,6 +38,9 @@
|
|
|
|
|
|
#define _COMPONENT ACPI_MEMORY_DEVICE_COMPONENT
|
|
#define _COMPONENT ACPI_MEMORY_DEVICE_COMPONENT
|
|
|
|
|
|
|
|
+#undef PREFIX
|
|
|
|
+#define PREFIX "ACPI:memory_hp:"
|
|
|
|
+
|
|
ACPI_MODULE_NAME("acpi_memhotplug");
|
|
ACPI_MODULE_NAME("acpi_memhotplug");
|
|
MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>");
|
|
MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>");
|
|
MODULE_DESCRIPTION("Hotplug Mem Driver");
|
|
MODULE_DESCRIPTION("Hotplug Mem Driver");
|
|
@@ -153,6 +156,7 @@ acpi_memory_get_device(acpi_handle handle,
|
|
acpi_handle phandle;
|
|
acpi_handle phandle;
|
|
struct acpi_device *device = NULL;
|
|
struct acpi_device *device = NULL;
|
|
struct acpi_device *pdevice = NULL;
|
|
struct acpi_device *pdevice = NULL;
|
|
|
|
+ int result;
|
|
|
|
|
|
|
|
|
|
if (!acpi_bus_get_device(handle, &device) && device)
|
|
if (!acpi_bus_get_device(handle, &device) && device)
|
|
@@ -165,9 +169,9 @@ acpi_memory_get_device(acpi_handle handle,
|
|
}
|
|
}
|
|
|
|
|
|
/* Get the parent device */
|
|
/* Get the parent device */
|
|
- status = acpi_bus_get_device(phandle, &pdevice);
|
|
|
|
- if (ACPI_FAILURE(status)) {
|
|
|
|
- ACPI_EXCEPTION((AE_INFO, status, "Cannot get acpi bus device"));
|
|
|
|
|
|
+ result = acpi_bus_get_device(phandle, &pdevice);
|
|
|
|
+ if (result) {
|
|
|
|
+ printk(KERN_WARNING PREFIX "Cannot get acpi bus device");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -175,9 +179,9 @@ acpi_memory_get_device(acpi_handle handle,
|
|
* Now add the notified device. This creates the acpi_device
|
|
* Now add the notified device. This creates the acpi_device
|
|
* and invokes .add function
|
|
* and invokes .add function
|
|
*/
|
|
*/
|
|
- status = acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE);
|
|
|
|
- if (ACPI_FAILURE(status)) {
|
|
|
|
- ACPI_EXCEPTION((AE_INFO, status, "Cannot add acpi bus"));
|
|
|
|
|
|
+ result = acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE);
|
|
|
|
+ if (result) {
|
|
|
|
+ printk(KERN_WARNING PREFIX "Cannot add acpi bus");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|