Merge tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / acpi / glue.c

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 0715e3be99a0be9b16a937d4bd98d3ec6cd646f7..fce3f3bba714add50426fbb04b0351c59d228a28 100644 (file)
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -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;
 }