]> asedeno.scripts.mit.edu Git - linux.git/blobdiff - drivers/memory/jz4780-nemc.c
Merge tag 'rproc-v4.20' of git://github.com/andersson/remoteproc
[linux.git] / drivers / memory / jz4780-nemc.c
index 919d1925acb961d3a038d5a2d9125500ef2dbf7d..bcf06adefc96c1c99c5dce6e79f1582c937a4a56 100644 (file)
@@ -322,8 +322,8 @@ static int jz4780_nemc_probe(struct platform_device *pdev)
                        bank = of_read_number(prop, 1);
                        if (bank < 1 || bank >= JZ4780_NEMC_NUM_BANKS) {
                                dev_err(nemc->dev,
-                                       "%s requests invalid bank %u\n",
-                                       child->full_name, bank);
+                                       "%pOF requests invalid bank %u\n",
+                                       child, bank);
 
                                /* Will continue the outer loop below. */
                                referenced = 0;
@@ -334,12 +334,12 @@ static int jz4780_nemc_probe(struct platform_device *pdev)
                }
 
                if (!referenced) {
-                       dev_err(nemc->dev, "%s has no addresses\n",
-                               child->full_name);
+                       dev_err(nemc->dev, "%pOF has no addresses\n",
+                               child);
                        continue;
                } else if (nemc->banks_present & referenced) {
-                       dev_err(nemc->dev, "%s conflicts with another node\n",
-                               child->full_name);
+                       dev_err(nemc->dev, "%pOF conflicts with another node\n",
+                               child);
                        continue;
                }