diff options
author | Toshi Kani <toshi.kani@hp.com> | 2012-11-20 18:42:29 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-21 17:20:23 -0500 |
commit | 3d78bd9ef746d6468b1dbb2518b1287092b997b5 (patch) | |
tree | 85099c34a054b7f6564ed638dbac6e45efa95a64 /drivers/acpi/container.c | |
parent | ab6c57099db14d64c383e4d0392eab05d013630f (diff) |
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: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/container.c')
-rw-r--r-- | drivers/acpi/container.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 69e2d6be910c..811910b50b75 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c | |||
@@ -110,12 +110,6 @@ static int acpi_container_add(struct acpi_device *device) | |||
110 | { | 110 | { |
111 | struct acpi_container *container; | 111 | struct acpi_container *container; |
112 | 112 | ||
113 | |||
114 | if (!device) { | ||
115 | printk(KERN_ERR PREFIX "device is NULL\n"); | ||
116 | return -EINVAL; | ||
117 | } | ||
118 | |||
119 | container = kzalloc(sizeof(struct acpi_container), GFP_KERNEL); | 113 | container = kzalloc(sizeof(struct acpi_container), GFP_KERNEL); |
120 | if (!container) | 114 | if (!container) |
121 | return -ENOMEM; | 115 | return -ENOMEM; |
@@ -177,7 +171,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context) | |||
177 | case ACPI_NOTIFY_BUS_CHECK: | 171 | case ACPI_NOTIFY_BUS_CHECK: |
178 | /* Fall through */ | 172 | /* Fall through */ |
179 | case ACPI_NOTIFY_DEVICE_CHECK: | 173 | case ACPI_NOTIFY_DEVICE_CHECK: |
180 | printk(KERN_WARNING "Container driver received %s event\n", | 174 | pr_debug("Container driver received %s event\n", |
181 | (type == ACPI_NOTIFY_BUS_CHECK) ? | 175 | (type == ACPI_NOTIFY_BUS_CHECK) ? |
182 | "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK"); | 176 | "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK"); |
183 | 177 | ||
@@ -198,7 +192,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context) | |||
198 | 192 | ||
199 | result = container_device_add(&device, handle); | 193 | result = container_device_add(&device, handle); |
200 | if (result) { | 194 | if (result) { |
201 | printk(KERN_WARNING "Failed to add container\n"); | 195 | acpi_handle_warn(handle, "Failed to add container\n"); |
202 | break; | 196 | break; |
203 | } | 197 | } |
204 | 198 | ||