diff for duplicates of <20100311180357.4824.50303.stgit@angua> diff --git a/a/content_digest b/N1/content_digest index 43b77a8..8d460dc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -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" "The device_node pointer is now stored in struct device->of_node so we\n" @@ -183,4 +196,4 @@ " \tstruct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata);\n" " \tunsigned int ngpios;" -6f2a945cc1468d05a35c8d677cf8a08180b0e1d8ef7d024009e7e90848820b1f +b68fd9d9f2a421dc17bdc78381484e668afd30e7801b3040250fea34462b44d5
diff --git a/a/1.txt b/N2/1.txt index a0986c1..8f8f80f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -76,7 +76,7 @@ index ab5daab..abc9b8c 100644 - node = dev_archdata_get_node(&client->dev.archdata); + node = client->dev.of_node; - if (node == NULL) + if (node = NULL) return NULL; diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c @@ -109,8 +109,8 @@ index 605bc42..43f803e 100644 static int of_dev_node_match(struct device *dev, void *data) { -- return dev_archdata_get_node(&dev->archdata) == data; -+ return dev->of_node == data; +- return dev_archdata_get_node(&dev->archdata) = data; ++ return dev->of_node = data; } /* must call put_device() when done with returned i2c_client device */ @@ -122,8 +122,8 @@ index 3bf20bf..64e08d7 100644 /* Helper function for of_phy_find_device */ static int of_phy_match(struct device *dev, void *phy_np) { -- return dev_archdata_get_node(&dev->archdata) == phy_np; -+ return dev->of_node == phy_np; +- return dev_archdata_get_node(&dev->archdata) = phy_np; ++ return dev->of_node = phy_np; } /** diff --git a/a/content_digest b/N2/content_digest index 43b77a8..26198a1 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 02/37] of: Eliminate dev_archdata_get_node()\0" - "Date\0Thu, 11 Mar 2010 11:03:58 -0700\0" + "Date\0Thu, 11 Mar 2010 18:03:58 +0000\0" "To\0monstr@monstr.eu" gregkh@suse.de benh@kernel.crashing.org @@ -91,7 +91,7 @@ " \n" "-\tnode = dev_archdata_get_node(&client->dev.archdata);\n" "+\tnode = client->dev.of_node;\n" - " \tif (node == NULL)\n" + " \tif (node = NULL)\n" " \t\treturn NULL;\n" " \n" "diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c\n" @@ -124,8 +124,8 @@ " \n" " static int of_dev_node_match(struct device *dev, void *data)\n" " {\n" - "- return dev_archdata_get_node(&dev->archdata) == data;\n" - "+ return dev->of_node == data;\n" + "- return dev_archdata_get_node(&dev->archdata) = data;\n" + "+ return dev->of_node = data;\n" " }\n" " \n" " /* must call put_device() when done with returned i2c_client device */\n" @@ -137,8 +137,8 @@ " /* Helper function for of_phy_find_device */\n" " static int of_phy_match(struct device *dev, void *phy_np)\n" " {\n" - "-\treturn dev_archdata_get_node(&dev->archdata) == phy_np;\n" - "+\treturn dev->of_node == phy_np;\n" + "-\treturn dev_archdata_get_node(&dev->archdata) = phy_np;\n" + "+\treturn dev->of_node = phy_np;\n" " }\n" " \n" " /**\n" @@ -183,4 +183,4 @@ " \tstruct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata);\n" " \tunsigned int ngpios;" -6f2a945cc1468d05a35c8d677cf8a08180b0e1d8ef7d024009e7e90848820b1f +e19ea8335f1ada036a0b6806730a1fe12153872d0703ea1a7fa5754e735b50cf
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.