Instead of looking up a symbol name by hand, use the %ps printk format
specifier.

Signed-off-by: Helge Deller <[email protected]>

diff --git a/drivers/power/reset/qnap-poweroff.c 
b/drivers/power/reset/qnap-poweroff.c
index 52b7dc61d870..0ddf7f25f7b8 100644
--- a/drivers/power/reset/qnap-poweroff.c
+++ b/drivers/power/reset/qnap-poweroff.c
@@ -14,7 +14,6 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/serial_reg.h>
-#include <linux/kallsyms.h>
 #include <linux/of.h>
 #include <linux/io.h>
 #include <linux/clk.h>
@@ -75,7 +74,6 @@ static int qnap_power_off_probe(struct platform_device *pdev)
        struct device_node *np = pdev->dev.of_node;
        struct resource *res;
        struct clk *clk;
-       char symname[KSYM_NAME_LEN];

        const struct of_device_id *match =
                of_match_node(qnap_power_off_of_match_table, np);
@@ -104,10 +102,8 @@ static int qnap_power_off_probe(struct platform_device 
*pdev)

        /* Check that nothing else has already setup a handler */
        if (pm_power_off) {
-               lookup_symbol_name((ulong)pm_power_off, symname);
-               dev_err(&pdev->dev,
-                       "pm_power_off already claimed %p %s",
-                       pm_power_off, symname);
+               dev_err(&pdev->dev, "pm_power_off already claimed for %ps",
+                       pm_power_off);
                return -EBUSY;
        }
        pm_power_off = qnap_power_off;
diff --git a/drivers/power/reset/syscon-poweroff.c 
b/drivers/power/reset/syscon-poweroff.c
index 4d6923b102b6..ed58bdf41e27 100644
--- a/drivers/power/reset/syscon-poweroff.c
+++ b/drivers/power/reset/syscon-poweroff.c
@@ -6,7 +6,6 @@
  * Author: Moritz Fischer <[email protected]>
  */

-#include <linux/kallsyms.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/notifier.h>
@@ -34,7 +33,6 @@ static void syscon_poweroff(void)

 static int syscon_poweroff_probe(struct platform_device *pdev)
 {
-       char symname[KSYM_NAME_LEN];
        int mask_err, value_err;

        map = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, "regmap");
@@ -65,10 +63,8 @@ static int syscon_poweroff_probe(struct platform_device 
*pdev)
        }

        if (pm_power_off) {
-               lookup_symbol_name((ulong)pm_power_off, symname);
-               dev_err(&pdev->dev,
-               "pm_power_off already claimed %p %s",
-               pm_power_off, symname);
+               dev_err(&pdev->dev, "pm_power_off already claimed for %ps",
+                       pm_power_off);
                return -EBUSY;
        }

Reply via email to