diff for duplicates of <20100311180426.4824.5566.stgit@angua> diff --git a/a/content_digest b/N1/content_digest index cc8fd52..5cdafc5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "ref\020100311174830.4824.19820.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" - "Subject\0[PATCH 07/37] drivers/serial: use .dev.of_node instead of .node in\tstruct of_device\0" + "Subject\0[PATCH 07/37] drivers/serial: use .dev.of_node instead of .node in struct of_device\0" "Date\0Thu, 11 Mar 2010 11:04:26 -0700\0" "To\0monstr@monstr.eu" gregkh@suse.de @@ -10,7 +10,20 @@ sfr@canb.auug.org.au jgarzik@pobox.com ben-linux@fluff.org - " dwmw2@infrade\0" + dwmw2@infradead.org + jeremy.kerr@canonical.com + James.Bottomley@suse.de + broonie@opensource.wolfsonmicro.com + microblaze-uclinux@itee.uq.edu.au + linux-kernel@vger.kernel.org + linuxppc-dev@ozlabs.org + sparclinux@vger.kernel.org + linux-ide@vger.kernel.org + netdev@vger.kernel.org + linux-i2c@vger.kernel.org + devicetree-discuss@lists.ozlabs.org + linux-scsi@vger.kernel.org + " alsa-devel@alsa-project.org\0" "\00:1\0" "b\0" ".node is being removed\n" @@ -158,4 +171,4 @@ " \treturn ulite_assign(&op->dev, id ? *id : -1, res.start+3, irq);\n" } -b83302f595cfac5dfc65691a6057fdb1761ea5d69d3b8cbe0a130bfeee49e364 +861b6dc7b1ba5962296eff350799ac892762a67b70e8dbc0d97086bf72644966
diff --git a/a/1.txt b/N2/1.txt index ecb56b0..f27dd6c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -17,8 +17,8 @@ index 3119fdd..cb07938 100644 /* Check validity & presence */ for (idx = 0; idx < MPC52xx_PSC_MAXNUM; idx++) -- if (mpc52xx_uart_nodes[idx] == op->node) -+ if (mpc52xx_uart_nodes[idx] == op->dev.of_node) +- if (mpc52xx_uart_nodes[idx] = op->node) ++ if (mpc52xx_uart_nodes[idx] = op->dev.of_node) break; if (idx >= MPC52xx_PSC_MAXNUM) return -EINVAL; @@ -27,7 +27,7 @@ index 3119fdd..cb07938 100644 - uartclk = psc_ops->getuartclk(op->node); + uartclk = psc_ops->getuartclk(op->dev.of_node); - if (uartclk == 0) { + if (uartclk = 0) { dev_dbg(&op->dev, "Could not find uart clock frequency!\n"); return -EINVAL; @@ -1355,7 +1355,7 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match) @@ -45,7 +45,7 @@ index 3119fdd..cb07938 100644 - psc_ops->get_irq(port, op->node); + psc_ops->get_irq(port, op->dev.of_node); - if (port->irq == NO_IRQ) { + if (port->irq = NO_IRQ) { dev_dbg(&op->dev, "Could not get irq\n"); return -EINVAL; diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c @@ -58,7 +58,7 @@ index 170d3d6..2ab82ed 100644 printk("%s: %s port at %llx, irq %u\n", - to_of_device(up->port.dev)->node->full_name, + to_of_device(up->port.dev)->dev.of_node->full_name, - (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); @@ -1351,7 +1351,7 @@ static int __init sunsu_console_setup(struct console *co, char *options) diff --git a/a/content_digest b/N2/content_digest index cc8fd52..c63c80b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020100311174830.4824.19820.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" - "Subject\0[PATCH 07/37] drivers/serial: use .dev.of_node instead of .node in\tstruct of_device\0" - "Date\0Thu, 11 Mar 2010 11:04:26 -0700\0" + "Subject\0[PATCH 07/37] drivers/serial: use .dev.of_node instead of .node in\0" + "Date\0Thu, 11 Mar 2010 18:04:26 +0000\0" "To\0monstr@monstr.eu" gregkh@suse.de benh@kernel.crashing.org @@ -32,8 +32,8 @@ " \n" " \t/* Check validity & presence */\n" " \tfor (idx = 0; idx < MPC52xx_PSC_MAXNUM; idx++)\n" - "-\t\tif (mpc52xx_uart_nodes[idx] == op->node)\n" - "+\t\tif (mpc52xx_uart_nodes[idx] == op->dev.of_node)\n" + "-\t\tif (mpc52xx_uart_nodes[idx] = op->node)\n" + "+\t\tif (mpc52xx_uart_nodes[idx] = op->dev.of_node)\n" " \t\t\tbreak;\n" " \tif (idx >= MPC52xx_PSC_MAXNUM)\n" " \t\treturn -EINVAL;\n" @@ -42,7 +42,7 @@ " \n" "-\tuartclk = psc_ops->getuartclk(op->node);\n" "+\tuartclk = psc_ops->getuartclk(op->dev.of_node);\n" - " \tif (uartclk == 0) {\n" + " \tif (uartclk = 0) {\n" " \t\tdev_dbg(&op->dev, \"Could not find uart clock frequency!\\n\");\n" " \t\treturn -EINVAL;\n" "@@ -1355,7 +1355,7 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)\n" @@ -60,7 +60,7 @@ " \n" "-\tpsc_ops->get_irq(port, op->node);\n" "+\tpsc_ops->get_irq(port, op->dev.of_node);\n" - " \tif (port->irq == NO_IRQ) {\n" + " \tif (port->irq = NO_IRQ) {\n" " \t\tdev_dbg(&op->dev, \"Could not get irq\\n\");\n" " \t\treturn -EINVAL;\n" "diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c\n" @@ -73,7 +73,7 @@ " \tprintk(\"%s: %s port at %llx, irq %u\\n\",\n" "-\t to_of_device(up->port.dev)->node->full_name,\n" "+\t to_of_device(up->port.dev)->dev.of_node->full_name,\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" "@@ -1351,7 +1351,7 @@ static int __init sunsu_console_setup(struct console *co, char *options)\n" @@ -158,4 +158,4 @@ " \treturn ulite_assign(&op->dev, id ? *id : -1, res.start+3, irq);\n" } -b83302f595cfac5dfc65691a6057fdb1761ea5d69d3b8cbe0a130bfeee49e364 +4d1f5eb6a4f9213a77815b0ab2486b10a610e7ad3f28267352a8c487d761c300
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.