Merge remote-tracking branches 'spi/topic/cadence', 'spi/topic/dt', 'spi/topic/ep93xx...
[muen/linux.git] / drivers / spi / spi.c
index f47d1ccdf29241c1e12ed7635e2cc71a59e0ebdf..cf8ee5e48f73659cae5471157b288f9e88669f64 100644 (file)
@@ -1587,8 +1587,8 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
 
        if (spi_controller_is_slave(ctlr)) {
                if (strcmp(nc->name, "slave")) {
-                       dev_err(&ctlr->dev, "%s is not called 'slave'\n",
-                               nc->full_name);
+                       dev_err(&ctlr->dev, "%pOF is not called 'slave'\n",
+                               nc);
                        return -EINVAL;
                }
                return 0;
@@ -1597,8 +1597,8 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
        /* Device address */
        rc = of_property_read_u32(nc, "reg", &value);
        if (rc) {
-               dev_err(&ctlr->dev, "%s has no valid 'reg' property (%d)\n",
-                       nc->full_name, rc);
+               dev_err(&ctlr->dev, "%pOF has no valid 'reg' property (%d)\n",
+                       nc, rc);
                return rc;
        }
        spi->chip_select = value;
@@ -1607,8 +1607,7 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
        rc = of_property_read_u32(nc, "spi-max-frequency", &value);
        if (rc) {
                dev_err(&ctlr->dev,
-                       "%s has no valid 'spi-max-frequency' property (%d)\n",
-                       nc->full_name, rc);
+                       "%pOF has no valid 'spi-max-frequency' property (%d)\n", nc, rc);
                return rc;
        }
        spi->max_speed_hz = value;
@@ -1625,8 +1624,7 @@ of_register_spi_device(struct spi_controller *ctlr, struct device_node *nc)
        /* Alloc an spi_device */
        spi = spi_alloc_device(ctlr);
        if (!spi) {
-               dev_err(&ctlr->dev, "spi_device alloc error for %s\n",
-                       nc->full_name);
+               dev_err(&ctlr->dev, "spi_device alloc error for %pOF\n", nc);
                rc = -ENOMEM;
                goto err_out;
        }
@@ -1635,8 +1633,7 @@ of_register_spi_device(struct spi_controller *ctlr, struct device_node *nc)
        rc = of_modalias_node(nc, spi->modalias,
                                sizeof(spi->modalias));
        if (rc < 0) {
-               dev_err(&ctlr->dev, "cannot find modalias for %s\n",
-                       nc->full_name);
+               dev_err(&ctlr->dev, "cannot find modalias for %pOF\n", nc);
                goto err_out;
        }
 
@@ -1651,8 +1648,7 @@ of_register_spi_device(struct spi_controller *ctlr, struct device_node *nc)
        /* Register the new device */
        rc = spi_add_device(spi);
        if (rc) {
-               dev_err(&ctlr->dev, "spi_device register error %s\n",
-                       nc->full_name);
+               dev_err(&ctlr->dev, "spi_device register error %pOF\n", nc);
                goto err_of_node_put;
        }
 
@@ -1686,8 +1682,7 @@ static void of_register_spi_devices(struct spi_controller *ctlr)
                spi = of_register_spi_device(ctlr, nc);
                if (IS_ERR(spi)) {
                        dev_warn(&ctlr->dev,
-                                "Failed to create SPI device for %s\n",
-                                nc->full_name);
+                                "Failed to create SPI device for %pOF\n", nc);
                        of_node_clear_flag(nc, OF_POPULATED);
                }
        }
@@ -3346,8 +3341,8 @@ static int of_spi_notify(struct notifier_block *nb, unsigned long action,
                put_device(&ctlr->dev);
 
                if (IS_ERR(spi)) {
-                       pr_err("%s: failed to create for '%s'\n",
-                                       __func__, rd->dn->full_name);
+                       pr_err("%s: failed to create for '%pOF'\n",
+                                       __func__, rd->dn);
                        of_node_clear_flag(rd->dn, OF_POPULATED);
                        return notifier_from_errno(PTR_ERR(spi));
                }