mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-26 05:34:13 +08:00
ACPI: glue: Clean up the printing messages
Remove the in house ACPI_GLUE_DEBUG and its related debug message printing, using pr_debug() instead. While at it, replace printk() with pr_* to simplify the code. Signed-off-by: Hanjun Guo <guohanjun@huawei.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
ad319565d6
commit
e2935abb3a
@ -6,6 +6,8 @@
|
||||
* Copyright (c) 2005 Intel Corp.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) "ACPI: " fmt
|
||||
|
||||
#include <linux/acpi_iort.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/init.h>
|
||||
@ -19,17 +21,6 @@
|
||||
|
||||
#include "internal.h"
|
||||
|
||||
#define ACPI_GLUE_DEBUG 0
|
||||
#if ACPI_GLUE_DEBUG
|
||||
#define DBG(fmt, ...) \
|
||||
printk(KERN_DEBUG PREFIX fmt, ##__VA_ARGS__)
|
||||
#else
|
||||
#define DBG(fmt, ...) \
|
||||
do { \
|
||||
if (0) \
|
||||
printk(KERN_DEBUG PREFIX fmt, ##__VA_ARGS__); \
|
||||
} while (0)
|
||||
#endif
|
||||
static LIST_HEAD(bus_type_list);
|
||||
static DECLARE_RWSEM(bus_type_sem);
|
||||
|
||||
@ -44,7 +35,7 @@ int register_acpi_bus_type(struct acpi_bus_type *type)
|
||||
down_write(&bus_type_sem);
|
||||
list_add_tail(&type->list, &bus_type_list);
|
||||
up_write(&bus_type_sem);
|
||||
printk(KERN_INFO PREFIX "bus type %s registered\n", type->name);
|
||||
pr_info("bus type %s registered\n", type->name);
|
||||
return 0;
|
||||
}
|
||||
return -ENODEV;
|
||||
@ -59,8 +50,7 @@ int unregister_acpi_bus_type(struct acpi_bus_type *type)
|
||||
down_write(&bus_type_sem);
|
||||
list_del_init(&type->list);
|
||||
up_write(&bus_type_sem);
|
||||
printk(KERN_INFO PREFIX "bus type %s unregistered\n",
|
||||
type->name);
|
||||
pr_info("bus type %s unregistered\n", type->name);
|
||||
return 0;
|
||||
}
|
||||
return -ENODEV;
|
||||
@ -307,7 +297,7 @@ static int acpi_device_notify(struct device *dev)
|
||||
|
||||
adev = type->find_companion(dev);
|
||||
if (!adev) {
|
||||
DBG("Unable to get handle for %s\n", dev_name(dev));
|
||||
pr_debug("Unable to get handle for %s\n", dev_name(dev));
|
||||
ret = -ENODEV;
|
||||
goto out;
|
||||
}
|
||||
@ -328,16 +318,15 @@ static int acpi_device_notify(struct device *dev)
|
||||
adev->handler->bind(dev);
|
||||
|
||||
out:
|
||||
#if ACPI_GLUE_DEBUG
|
||||
if (!ret) {
|
||||
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
|
||||
|
||||
acpi_get_name(ACPI_HANDLE(dev), ACPI_FULL_PATHNAME, &buffer);
|
||||
DBG("Device %s -> %s\n", dev_name(dev), (char *)buffer.pointer);
|
||||
pr_debug("Device %s -> %s\n", dev_name(dev), (char *)buffer.pointer);
|
||||
kfree(buffer.pointer);
|
||||
} else
|
||||
DBG("Device %s -> No ACPI support\n", dev_name(dev));
|
||||
#endif
|
||||
} else {
|
||||
pr_debug("Device %s -> No ACPI support\n", dev_name(dev));
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user