]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
uio: Convert a few more users to using %pOFn instead of device_node.name
authorRob Herring <robh@kernel.org>
Mon, 1 Oct 2018 21:43:51 +0000 (16:43 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Oct 2018 22:59:29 +0000 (15:59 -0700)
In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/uio/uio_dmem_genirq.c
drivers/uio/uio_pdrv_genirq.c

index e1134a4d97f3fd0005e30dc29e9acf9da77e0e46..003badaef5f3d9cdcf0eb21380609703d6c92de9 100644 (file)
@@ -163,7 +163,8 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
                        dev_err(&pdev->dev, "unable to kmalloc\n");
                        goto bad2;
                }
-               uioinfo->name = pdev->dev.of_node->name;
+               uioinfo->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%pOFn",
+                                              pdev->dev.of_node);
                uioinfo->version = "devicetree";
 
                /* Multiple IRQs are not supported */
index f598ecddc8a703a9e8cec96228d3bf526c92b517..6c759934bff3b5b8e739df3a1828f03cf70c7af1 100644 (file)
@@ -118,7 +118,8 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
                        dev_err(&pdev->dev, "unable to kmalloc\n");
                        return -ENOMEM;
                }
-               uioinfo->name = pdev->dev.of_node->name;
+               uioinfo->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%pOFn",
+                                              pdev->dev.of_node);
                uioinfo->version = "devicetree";
                /* Multiple IRQs are not supported */
        }