Merge branch 'gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[firefly-linux-kernel-4.4.55.git] / drivers / of / address.c

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 06af494184d657456df3c353b9e61e380ec98dec..ad2906919d4589f4edbc0cd599a2fe7aa2938922 100644 (file)
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -491,7 +491,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
         */
        ranges = of_get_property(parent, rprop, &rlen);
        if (ranges == NULL && !of_empty_ranges_quirk()) {
-               pr_err("OF: no ranges; cannot translate\n");
+               pr_debug("OF: no ranges; cannot translate\n");
                return 1;
        }
        if (ranges == NULL || rlen == 0) {
@@ -884,7 +884,7 @@ EXPORT_SYMBOL(of_iomap);
  *             return PTR_ERR(base);
  */
 void __iomem *of_io_request_and_map(struct device_node *np, int index,
-                                       char *name)
+                                       const char *name)
 {
        struct resource res;
        void __iomem *mem;