diff for duplicates of <20170718214339.7774-54-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 1f414ee..33d3928 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,7 +29,7 @@ index 61fe8d6fd24e..a1c7125cb968 100644 @@ -122,7 +122,7 @@ static int find_console_handle(void) stdout_irq = irq_of_parse_and_map(np, 0); - if (stdout_irq == NO_IRQ) { + if (stdout_irq = NO_IRQ) { - pr_err("ehv-bc: no 'interrupts' property in %s node\n", np->full_name); + pr_err("ehv-bc: no 'interrupts' property in %pOF node\n", np); return 0; @@ -51,7 +51,7 @@ index 510799311099..16331a90c1e8 100644 } @@ -204,14 +204,14 @@ static int hvc_opal_probe(struct platform_device *dev) - /* Instanciate now to establish a mapping index==vtermno */ + /* Instanciate now to establish a mapping index=vtermno */ hvc_instantiate(termno, termno, ops); } else { - pr_err("hvc_opal: Device %s has duplicate terminal number #%d\n", @@ -63,7 +63,7 @@ index 510799311099..16331a90c1e8 100644 - pr_info("hvc%d: %s protocol on %s%s\n", termno, + pr_info("hvc%d: %s protocol on %pOF%s\n", termno, - proto == HV_PROTOCOL_RAW ? "raw" : "hvsi", + proto = HV_PROTOCOL_RAW ? "raw" : "hvsi", - dev->dev.of_node->full_name, + dev->dev.of_node, boot ? " (boot console)" : ""); @@ -97,7 +97,7 @@ index b05dc5086627..78b003be7f67 100644 - vdev->dev.of_node->full_name, + pr_devel("hvc_vio_probe() device %pOF, using %s protocol\n", + vdev->dev.of_node, - proto == HV_PROTOCOL_RAW ? "raw" : "hvsi"); + proto = HV_PROTOCOL_RAW ? "raw" : "hvsi"); /* Is it our boot one ? */ diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c @@ -170,14 +170,14 @@ index 72df2e1b88af..5380407bb0be 100644 --- a/drivers/tty/serial/sunsu.c +++ b/drivers/tty/serial/sunsu.c @@ -1212,8 +1212,8 @@ static int sunsu_kbd_ms_init(struct uart_sunsu_port *up) - if (up->port.type == PORT_UNKNOWN) + if (up->port.type = PORT_UNKNOWN) return -ENODEV; - printk("%s: %s port at %llx, irq %u\n", - up->port.dev->of_node->full_name, + printk("%pOF: %s port at %llx, irq %u\n", + up->port.dev->of_node, - (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse", + (up->su_type = SU_PORT_KBD) ? "Keyboard" : "Mouse", (unsigned long long) up->port.mapbase, up->port.irq); -- diff --git a/a/content_digest b/N1/content_digest index 2beef55..545e6a8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH] tty: Convert to using %pOF instead of full_name\0" - "Date\0Tue, 18 Jul 2017 16:43:34 -0500\0" + "Date\0Tue, 18 Jul 2017 21:43:34 +0000\0" "To\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Cc\0linux-kernel@vger.kernel.org" devicetree@vger.kernel.org @@ -45,7 +45,7 @@ "@@ -122,7 +122,7 @@ static int find_console_handle(void)\n" "\n" " \tstdout_irq = irq_of_parse_and_map(np, 0);\n" - " \tif (stdout_irq == NO_IRQ) {\n" + " \tif (stdout_irq = NO_IRQ) {\n" "-\t\tpr_err(\"ehv-bc: no 'interrupts' property in %s node\\n\", np->full_name);\n" "+\t\tpr_err(\"ehv-bc: no 'interrupts' property in %pOF node\\n\", np);\n" " \t\treturn 0;\n" @@ -67,7 +67,7 @@ " \t}\n" "\n" "@@ -204,14 +204,14 @@ static int hvc_opal_probe(struct platform_device *dev)\n" - " \t\t/* Instanciate now to establish a mapping index==vtermno */\n" + " \t\t/* Instanciate now to establish a mapping index=vtermno */\n" " \t\thvc_instantiate(termno, termno, ops);\n" " \t} else {\n" "-\t\tpr_err(\"hvc_opal: Device %s has duplicate terminal number #%d\\n\",\n" @@ -79,7 +79,7 @@ "\n" "-\tpr_info(\"hvc%d: %s protocol on %s%s\\n\", termno,\n" "+\tpr_info(\"hvc%d: %s protocol on %pOF%s\\n\", termno,\n" - " \t\tproto == HV_PROTOCOL_RAW ? \"raw\" : \"hvsi\",\n" + " \t\tproto = HV_PROTOCOL_RAW ? \"raw\" : \"hvsi\",\n" "-\t\tdev->dev.of_node->full_name,\n" "+\t\tdev->dev.of_node,\n" " \t\tboot ? \" (boot console)\" : \"\");\n" @@ -113,7 +113,7 @@ "-\t\t vdev->dev.of_node->full_name,\n" "+\tpr_devel(\"hvc_vio_probe() device %pOF, using %s protocol\\n\",\n" "+\t\t vdev->dev.of_node,\n" - " \t\t proto == HV_PROTOCOL_RAW ? \"raw\" : \"hvsi\");\n" + " \t\t proto = HV_PROTOCOL_RAW ? \"raw\" : \"hvsi\");\n" "\n" " \t/* Is it our boot one ? */\n" "diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c\n" @@ -186,17 +186,17 @@ "--- a/drivers/tty/serial/sunsu.c\n" "+++ b/drivers/tty/serial/sunsu.c\n" "@@ -1212,8 +1212,8 @@ static int sunsu_kbd_ms_init(struct uart_sunsu_port *up)\n" - " \tif (up->port.type == PORT_UNKNOWN)\n" + " \tif (up->port.type = PORT_UNKNOWN)\n" " \t\treturn -ENODEV;\n" "\n" "-\tprintk(\"%s: %s port at %llx, irq %u\\n\",\n" "-\t up->port.dev->of_node->full_name,\n" "+\tprintk(\"%pOF: %s port at %llx, irq %u\\n\",\n" "+\t up->port.dev->of_node,\n" - " \t (up->su_type == SU_PORT_KBD) ? \"Keyboard\" : \"Mouse\",\n" + " \t (up->su_type = SU_PORT_KBD) ? \"Keyboard\" : \"Mouse\",\n" " \t (unsigned long long) up->port.mapbase,\n" " \t up->port.irq);\n" "--\n" 2.11.0 -62bbf2da70c4909fa19ce22f25a46cf9202b748578513accebe51d5de8bab9b7 +0dd20993354f6bdbbaefc7da64fd8350fd8f5248034ec160080fcf1471c4f813
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.