Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

power: reset: Use printk format symbol resolver

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

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

authored by

Helge Deller and committed by
Sebastian Reichel
36dbca14 0dd713ef

+4 -12
+2 -6
drivers/power/reset/qnap-poweroff.c
··· 14 14 #include <linux/module.h> 15 15 #include <linux/platform_device.h> 16 16 #include <linux/serial_reg.h> 17 - #include <linux/kallsyms.h> 18 17 #include <linux/of.h> 19 18 #include <linux/io.h> 20 19 #include <linux/clk.h> ··· 74 75 struct device_node *np = pdev->dev.of_node; 75 76 struct resource *res; 76 77 struct clk *clk; 77 - char symname[KSYM_NAME_LEN]; 78 78 79 79 const struct of_device_id *match = 80 80 of_match_node(qnap_power_off_of_match_table, np); ··· 102 104 103 105 /* Check that nothing else has already setup a handler */ 104 106 if (pm_power_off) { 105 - lookup_symbol_name((ulong)pm_power_off, symname); 106 - dev_err(&pdev->dev, 107 - "pm_power_off already claimed %p %s", 108 - pm_power_off, symname); 107 + dev_err(&pdev->dev, "pm_power_off already claimed for %ps", 108 + pm_power_off); 109 109 return -EBUSY; 110 110 } 111 111 pm_power_off = qnap_power_off;
+2 -6
drivers/power/reset/syscon-poweroff.c
··· 6 6 * Author: Moritz Fischer <moritz.fischer@ettus.com> 7 7 */ 8 8 9 - #include <linux/kallsyms.h> 10 9 #include <linux/delay.h> 11 10 #include <linux/io.h> 12 11 #include <linux/notifier.h> ··· 33 34 34 35 static int syscon_poweroff_probe(struct platform_device *pdev) 35 36 { 36 - char symname[KSYM_NAME_LEN]; 37 37 int mask_err, value_err; 38 38 39 39 map = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, "regmap"); ··· 63 65 } 64 66 65 67 if (pm_power_off) { 66 - lookup_symbol_name((ulong)pm_power_off, symname); 67 - dev_err(&pdev->dev, 68 - "pm_power_off already claimed %p %s", 69 - pm_power_off, symname); 68 + dev_err(&pdev->dev, "pm_power_off already claimed for %ps", 69 + pm_power_off); 70 70 return -EBUSY; 71 71 } 72 72