Commit c6c93048 authored by Rob Herring's avatar Rob Herring Committed by Vinod Koul

dmaengine: Convert to using %pOF instead of full_name

Now that we have a custom printf format specifier, convert users of
full_name to use %pOF instead. This is preparation to remove storing
of the full path string for each node.
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: dmaengine@vger.kernel.org
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 5771a8c0
...@@ -38,8 +38,8 @@ static struct of_dma *of_dma_find_controller(struct of_phandle_args *dma_spec) ...@@ -38,8 +38,8 @@ static struct of_dma *of_dma_find_controller(struct of_phandle_args *dma_spec)
if (ofdma->of_node == dma_spec->np) if (ofdma->of_node == dma_spec->np)
return ofdma; return ofdma;
pr_debug("%s: can't find DMA controller %s\n", __func__, pr_debug("%s: can't find DMA controller %pOF\n", __func__,
dma_spec->np->full_name); dma_spec->np);
return NULL; return NULL;
} }
...@@ -255,8 +255,8 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np, ...@@ -255,8 +255,8 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
count = of_property_count_strings(np, "dma-names"); count = of_property_count_strings(np, "dma-names");
if (count < 0) { if (count < 0) {
pr_err("%s: dma-names property of node '%s' missing or empty\n", pr_err("%s: dma-names property of node '%pOF' missing or empty\n",
__func__, np->full_name); __func__, np);
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
} }
......
...@@ -4040,9 +4040,9 @@ static int ppc440spe_adma_probe(struct platform_device *ofdev) ...@@ -4040,9 +4040,9 @@ static int ppc440spe_adma_probe(struct platform_device *ofdev)
/* it is DMA0 or DMA1 */ /* it is DMA0 or DMA1 */
idx = of_get_property(np, "cell-index", &len); idx = of_get_property(np, "cell-index", &len);
if (!idx || (len != sizeof(u32))) { if (!idx || (len != sizeof(u32))) {
dev_err(&ofdev->dev, "Device node %s has missing " dev_err(&ofdev->dev, "Device node %pOF has missing "
"or invalid cell-index property\n", "or invalid cell-index property\n",
np->full_name); np);
return -EINVAL; return -EINVAL;
} }
id = *idx; id = *idx;
...@@ -4448,8 +4448,7 @@ static int ppc440spe_configure_raid_devices(void) ...@@ -4448,8 +4448,7 @@ static int ppc440spe_configure_raid_devices(void)
dcr_base = dcr_resource_start(np, 0); dcr_base = dcr_resource_start(np, 0);
dcr_len = dcr_resource_len(np, 0); dcr_len = dcr_resource_len(np, 0);
if (!dcr_base && !dcr_len) { if (!dcr_base && !dcr_len) {
pr_err("%s: can't get DCR registers base/len!\n", pr_err("%pOF: can't get DCR registers base/len!\n", np);
np->full_name);
of_node_put(np); of_node_put(np);
iounmap(i2o_reg); iounmap(i2o_reg);
return -ENODEV; return -ENODEV;
...@@ -4457,7 +4456,7 @@ static int ppc440spe_configure_raid_devices(void) ...@@ -4457,7 +4456,7 @@ static int ppc440spe_configure_raid_devices(void)
i2o_dcr_host = dcr_map(np, dcr_base, dcr_len); i2o_dcr_host = dcr_map(np, dcr_base, dcr_len);
if (!DCR_MAP_OK(i2o_dcr_host)) { if (!DCR_MAP_OK(i2o_dcr_host)) {
pr_err("%s: failed to map DCRs!\n", np->full_name); pr_err("%pOF: failed to map DCRs!\n", np);
of_node_put(np); of_node_put(np);
iounmap(i2o_reg); iounmap(i2o_reg);
return -ENODEV; return -ENODEV;
...@@ -4518,15 +4517,14 @@ static int ppc440spe_configure_raid_devices(void) ...@@ -4518,15 +4517,14 @@ static int ppc440spe_configure_raid_devices(void)
dcr_base = dcr_resource_start(np, 0); dcr_base = dcr_resource_start(np, 0);
dcr_len = dcr_resource_len(np, 0); dcr_len = dcr_resource_len(np, 0);
if (!dcr_base && !dcr_len) { if (!dcr_base && !dcr_len) {
pr_err("%s: can't get DCR registers base/len!\n", pr_err("%pOF: can't get DCR registers base/len!\n", np);
np->full_name);
ret = -ENODEV; ret = -ENODEV;
goto out_mq; goto out_mq;
} }
ppc440spe_mq_dcr_host = dcr_map(np, dcr_base, dcr_len); ppc440spe_mq_dcr_host = dcr_map(np, dcr_base, dcr_len);
if (!DCR_MAP_OK(ppc440spe_mq_dcr_host)) { if (!DCR_MAP_OK(ppc440spe_mq_dcr_host)) {
pr_err("%s: failed to map DCRs!\n", np->full_name); pr_err("%pOF: failed to map DCRs!\n", np);
ret = -ENODEV; ret = -ENODEV;
goto out_mq; goto out_mq;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment