Merge tag 'leds_for_4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszews...

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / 512x / mpc512x_shared.c

diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index 6b4f4cb7009a33c3fed9e0dce6df52cb2c006330..f99e79ee060e11169c3ef72522324fd23b5627c1 100644 (file)
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -387,8 +387,8 @@ static unsigned int __init get_fifo_size(struct device_node *np,
        if (fp)
                return *fp;
 
-       pr_warning("no %s property in %s node, defaulting to %d\n",
-                  prop_name, np->full_name, DEFAULT_FIFO_SIZE);
+       pr_warning("no %s property in %pOF node, defaulting to %d\n",
+                  prop_name, np, DEFAULT_FIFO_SIZE);
 
        return DEFAULT_FIFO_SIZE;
 }
@@ -426,15 +426,15 @@ static void __init mpc512x_psc_fifo_init(void)
 
                psc = of_iomap(np, 0);
                if (!psc) {
-                       pr_err("%s: Can't map %s device\n",
-                               __func__, np->full_name);
+                       pr_err("%s: Can't map %pOF device\n",
+                               __func__, np);
                        continue;
                }
 
                /* FIFO space is 4KiB, check if requested size is available */
                if ((fifobase + tx_fifo_size + rx_fifo_size) > 0x1000) {
-                       pr_err("%s: no fifo space available for %s\n",
-                               __func__, np->full_name);
+                       pr_err("%s: no fifo space available for %pOF\n",
+                               __func__, np);
                        iounmap(psc);
                        /*
                         * chances are that another device requests less