Commit 3d78bd9e authored by Toshi Kani's avatar Toshi Kani Committed by Rafael J. Wysocki
Browse files

ACPI: Update Container hotplug error messages 



Updated Container hotplug error messages with acpi_handle_<level>()
and pr_<level>().  Removed an unnecessary check to the device arg
in acpi_container_add().

Signed-off-by: default avatarToshi Kani <toshi.kani@hp.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ab6c5709

drivers/acpi/container.c

+2 −8
Original line number Diff line number Diff line
@@ -110,12 +110,6 @@ static int acpi_container_add(struct acpi_device *device) 
{

	struct acpi_container *container;





	if (!device) {

		printk(KERN_ERR PREFIX "device is NULL\n");

		return -EINVAL;

	}



	container = kzalloc(sizeof(struct acpi_container), GFP_KERNEL);

	if (!container)

		return -ENOMEM;
@@ -177,7 +171,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context) 
	case ACPI_NOTIFY_BUS_CHECK:

		/* Fall through */

	case ACPI_NOTIFY_DEVICE_CHECK:

		printk(KERN_WARNING "Container driver received %s event\n",

		pr_debug("Container driver received %s event\n",

		       (type == ACPI_NOTIFY_BUS_CHECK) ?

		       "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK");
@@ -198,7 +192,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context) 


		result = container_device_add(&device, handle);

		if (result) {

			printk(KERN_WARNING "Failed to add container\n");

			acpi_handle_warn(handle, "Failed to add container\n");

			break;

		}