diff for duplicates of <20100311180504.4824.59817.stgit@angua> diff --git a/a/content_digest b/N1/content_digest index 45afcb0..8f61628 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 14/37] drivers/spi: use .dev.of_node instead of .node in\tstruct of_device\0" + "Subject\0[PATCH 14/37] drivers/spi: use .dev.of_node instead of .node in struct of_device\0" "Date\0Thu, 11 Mar 2010 11:05:05 -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" @@ -109,4 +122,4 @@ " \n" " \treturn rc;" -415801460318d034f9074a63f372dac6ad18456cd50761d8663fcc26dcb32245 +fa11f92e6f77e5e02399a2a5b570a04b1ece8f5ad4412c2f30e4d5dac3523efe
diff --git a/a/1.txt b/N2/1.txt index c2583f3..14c7e61 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -25,7 +25,7 @@ index 0474786..f12cfd9 100644 + regaddr64 = of_translate_address(op->dev.of_node, regaddr_p); /* get PSC id (1..6, used by port_config) */ - if (op->dev.platform_data == NULL) { + if (op->dev.platform_data = NULL) { const u32 *psc_nump; - psc_nump = of_get_property(op->node, "cell-index", NULL); @@ -39,7 +39,7 @@ index 0474786..f12cfd9 100644 rc = mpc52xx_psc_spi_do_probe(&op->dev, (u32)regaddr64, (u32)size64, - irq_of_parse_and_map(op->node, 0), id); + irq_of_parse_and_map(op->dev.of_node, 0), id); - if (rc == 0) + if (rc = 0) - of_register_spi_devices(dev_get_drvdata(&op->dev), op->node); + of_register_spi_devices(dev_get_drvdata(&op->dev), + op->dev.of_node); diff --git a/a/content_digest b/N2/content_digest index 45afcb0..dcdbe50 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 14/37] drivers/spi: use .dev.of_node instead of .node in\tstruct of_device\0" - "Date\0Thu, 11 Mar 2010 11:05:05 -0700\0" + "Subject\0[PATCH 14/37] drivers/spi: use .dev.of_node instead of .node in\0" + "Date\0Thu, 11 Mar 2010 18:05:05 +0000\0" "To\0monstr@monstr.eu" gregkh@suse.de benh@kernel.crashing.org @@ -40,7 +40,7 @@ "+\tregaddr64 = of_translate_address(op->dev.of_node, regaddr_p);\n" " \n" " \t/* get PSC id (1..6, used by port_config) */\n" - " \tif (op->dev.platform_data == NULL) {\n" + " \tif (op->dev.platform_data = NULL) {\n" " \t\tconst u32 *psc_nump;\n" " \n" "-\t\tpsc_nump = of_get_property(op->node, \"cell-index\", NULL);\n" @@ -54,7 +54,7 @@ " \trc = mpc52xx_psc_spi_do_probe(&op->dev, (u32)regaddr64, (u32)size64,\n" "-\t\t\t\t\tirq_of_parse_and_map(op->node, 0), id);\n" "+\t\t\t\tirq_of_parse_and_map(op->dev.of_node, 0), id);\n" - " \tif (rc == 0)\n" + " \tif (rc = 0)\n" "-\t\tof_register_spi_devices(dev_get_drvdata(&op->dev), op->node);\n" "+\t\tof_register_spi_devices(dev_get_drvdata(&op->dev),\n" "+\t\t\t\t\top->dev.of_node);\n" @@ -109,4 +109,4 @@ " \n" " \treturn rc;" -415801460318d034f9074a63f372dac6ad18456cd50761d8663fcc26dcb32245 +476718ad6b36ae0f1f5b5f49181aa15ee90d0a5d2efcf1d3312766105e083a85
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.