diff for duplicates of <20181107223151.14991-5-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index b71d6de..668caf9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ index 4e8f56c3793c..6145658d915a 100644 - dp->full_name); + printk(KERN_INFO "AUXIO: Found device at %pOF\n", dp); - if (auxio_devtype = AUXIO_TYPE_EBUS) + if (auxio_devtype == AUXIO_TYPE_EBUS) auxio_set_led(AUXIO_LED_ON); diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c index 0de4bcb8261f..61fe1b951ba3 100644 @@ -195,7 +195,7 @@ index 17ea16a1337c..45ba2757a1b9 100644 /* parse bus-range property */ busrange = of_get_property(node, "bus-range", &len); - if (busrange = NULL || len != 8) { + if (busrange == NULL || len != 8) { - pci_info(dev, "Can't get bus-range for PCI-PCI bridge %s\n", - node->full_name); + pci_info(dev, "Can't get bus-range for PCI-PCI bridge %pOF\n", @@ -246,7 +246,7 @@ index 17ea16a1337c..45ba2757a1b9 100644 - pci_info(bus, " * %s\n", child->full_name); + pci_info(bus, " * %pOF\n", child); reg = of_get_property(child, "reg", ®len); - if (reg = NULL || reglen < 20) + if (reg == NULL || reglen < 20) continue; @@ -598,7 +598,7 @@ show_pciobppath_attr(struct device * dev, struct device_attribute * attr, char * pdev = to_pci_dev(dev); @@ -303,7 +303,7 @@ index 30e33b461970..f2835cddf362 100644 @@ -301,7 +301,7 @@ void __init of_console_init(void) of_console_device = dp; - if (prom_vers = PROM_V2) { + if (prom_vers == PROM_V2) { - strcpy(of_console_path, dp->full_name); + sprintf(of_console_path, "%pOF", dp); switch (*romvec->pv_stdout) { @@ -340,7 +340,7 @@ index d869d409fce6..6d266d7dd2b6 100644 } board_parent = bus->parent; board = of_getintprop_default(board_parent, "board#", -1); - if (board = -1) { + if (board == -1) { - printk(KERN_ERR "%s: Error, lacks board# property.\n", - board_parent->full_name); + printk(KERN_ERR "%pOF: Error, lacks board# property.\n", diff --git a/a/content_digest b/N1/content_digest index bd8895e..7f96bf0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020181107223151.14991-1-robh@kernel.org\0" "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH 4/8] sparc: Convert to using %pOF instead of full_name\0" - "Date\0Wed, 07 Nov 2018 22:31:47 +0000\0" + "Date\0Wed, 7 Nov 2018 16:31:47 -0600\0" "To\0David S. Miller <davem@davemloft.net>\0" "Cc\0Frank Rowand <frowand.list@gmail.com>" linux-kernel@vger.kernel.org @@ -40,7 +40,7 @@ "-\t dp->full_name);\n" "+\tprintk(KERN_INFO \"AUXIO: Found device at %pOF\\n\", dp);\n" " \n" - " \tif (auxio_devtype = AUXIO_TYPE_EBUS)\n" + " \tif (auxio_devtype == AUXIO_TYPE_EBUS)\n" " \t\tauxio_set_led(AUXIO_LED_ON);\n" "diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c\n" "index 0de4bcb8261f..61fe1b951ba3 100644\n" @@ -205,7 +205,7 @@ " \n" " \t/* parse bus-range property */\n" " \tbusrange = of_get_property(node, \"bus-range\", &len);\n" - " \tif (busrange = NULL || len != 8) {\n" + " \tif (busrange == NULL || len != 8) {\n" "-\t\tpci_info(dev, \"Can't get bus-range for PCI-PCI bridge %s\\n\",\n" "-\t\t node->full_name);\n" "+\t\tpci_info(dev, \"Can't get bus-range for PCI-PCI bridge %pOF\\n\",\n" @@ -256,7 +256,7 @@ "-\t\t\tpci_info(bus, \" * %s\\n\", child->full_name);\n" "+\t\t\tpci_info(bus, \" * %pOF\\n\", child);\n" " \t\treg = of_get_property(child, \"reg\", ®len);\n" - " \t\tif (reg = NULL || reglen < 20)\n" + " \t\tif (reg == NULL || reglen < 20)\n" " \t\t\tcontinue;\n" "@@ -598,7 +598,7 @@ show_pciobppath_attr(struct device * dev, struct device_attribute * attr, char *\n" " \tpdev = to_pci_dev(dev);\n" @@ -313,7 +313,7 @@ "@@ -301,7 +301,7 @@ void __init of_console_init(void)\n" " \t\tof_console_device = dp;\n" " \n" - " \t\tif (prom_vers = PROM_V2) {\n" + " \t\tif (prom_vers == PROM_V2) {\n" "-\t\t\tstrcpy(of_console_path, dp->full_name);\n" "+\t\t\tsprintf(of_console_path, \"%pOF\", dp);\n" " \t\t\tswitch (*romvec->pv_stdout) {\n" @@ -350,7 +350,7 @@ " \t}\n" " \tboard_parent = bus->parent;\n" " \tboard = of_getintprop_default(board_parent, \"board#\", -1);\n" - " \tif (board = -1) {\n" + " \tif (board == -1) {\n" "-\t\tprintk(KERN_ERR \"%s: Error, lacks board# property.\\n\",\n" "-\t\t\tboard_parent->full_name);\n" "+\t\tprintk(KERN_ERR \"%pOF: Error, lacks board# property.\\n\",\n" @@ -411,4 +411,4 @@ "-- \n" 2.19.1 -29f5ae2e7e64065e169fc8972e256409a3e1a5601057585be3403c1b0c69bfa2 +25b3d8ea63c1ccd68ddb34ae6871adde5c73dfcf8348339f9f071010b7004186
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.