diff for duplicates of <20100311180409.4824.64311.stgit@angua> diff --git a/a/content_digest b/N1/content_digest index 65bad79..4e17b16 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 04/37] arch/sparc: use .dev.of_node instead of .node in struct\tof_device\0" + "Subject\0[PATCH 04/37] arch/sparc: use .dev.of_node instead of .node in struct of_device\0" "Date\0Thu, 11 Mar 2010 11:04:09 -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" @@ -793,4 +806,4 @@ " \t/* On an Enterprise system there can be multiple mostek clocks.\n" " \t * We should only match the one that is on the central FHC bus." -170a8c75dc9176f818fff1bc8b142681c6e4f7756e8ac12517b5a788f59cb8a8 +ad96c38a94ee80b3826ceed48e8d0498410d01741e7ee13ba3ac724a9eec0555
diff --git a/a/1.txt b/N2/1.txt index 794068d..e57fcaf 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -94,7 +94,7 @@ index 4589ca3..dfc3698 100644 } else { - p->board_num = of_getintprop_default(op->node, "board#", -1); + p->board_num = of_getintprop_default(op->dev.of_node, "board#", -1); - if (p->board_num == -1) { + if (p->board_num = -1) { printk(KERN_ERR "fhc: No board# property\n"); goto out_unmap_pregs; diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c @@ -174,7 +174,7 @@ index 5a5509c..909bee0 100644 - preg = of_get_property(op->node, bus->addr_prop_name, &num_reg); + preg = of_get_property(op->dev.of_node, bus->addr_prop_name, &num_reg); - if (!preg || num_reg == 0) + if (!preg || num_reg = 0) return; @@ -271,8 +271,8 @@ static void __init build_device_resources(struct of_device *op, @@ -221,7 +221,7 @@ index 9d30b07..e436381 100644 - preg = of_get_property(op->node, bus->addr_prop_name, &num_reg); + preg = of_get_property(op->dev.of_node, bus->addr_prop_name, &num_reg); - if (!preg || num_reg == 0) + if (!preg || num_reg = 0) return; @@ -340,7 +340,7 @@ static void __init build_device_resources(struct of_device *op, @@ -311,8 +311,8 @@ index cb8eb79..21b3923 100644 struct of_device *op = to_of_device(dev); struct device_node *dp = data; -- return (op->node == dp); -+ return (op->dev.of_node == dp); +- return (op->node = dp); ++ return (op->dev.of_node = dp); } struct of_device *of_find_device_by_node(struct device_node *dp) @@ -551,8 +551,7 @@ index 2b5cdde..2f3f921 100644 @@ -1068,7 +1068,7 @@ static void __devinit schizo_scan_bus(struct pci_pbm_info *pbm, { pbm_config_busmastering(pbm); - pbm->is_66mhz_capable = -- (of_find_property(pbm->op->node, "66mhz-capable", NULL) + pbm->is_66mhz_capable - (of_find_property(pbm->op->node, "66mhz-capable", NULL) + (of_find_property(pbm->op->dev.of_node, "66mhz-capable", NULL) != NULL); diff --git a/a/content_digest b/N2/content_digest index 65bad79..1ef3d38 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 04/37] arch/sparc: use .dev.of_node instead of .node in struct\tof_device\0" - "Date\0Thu, 11 Mar 2010 11:04:09 -0700\0" + "Subject\0[PATCH 04/37] arch/sparc: use .dev.of_node instead of .node in struct\0" + "Date\0Thu, 11 Mar 2010 18:04:09 +0000\0" "To\0monstr@monstr.eu" gregkh@suse.de benh@kernel.crashing.org @@ -109,7 +109,7 @@ " \t} else {\n" "-\t\tp->board_num = of_getintprop_default(op->node, \"board#\", -1);\n" "+\t\tp->board_num = of_getintprop_default(op->dev.of_node, \"board#\", -1);\n" - " \t\tif (p->board_num == -1) {\n" + " \t\tif (p->board_num = -1) {\n" " \t\t\tprintk(KERN_ERR \"fhc: No board# property\\n\");\n" " \t\t\tgoto out_unmap_pregs;\n" "diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c\n" @@ -189,7 +189,7 @@ " \n" "-\tpreg = of_get_property(op->node, bus->addr_prop_name, &num_reg);\n" "+\tpreg = of_get_property(op->dev.of_node, bus->addr_prop_name, &num_reg);\n" - " \tif (!preg || num_reg == 0)\n" + " \tif (!preg || num_reg = 0)\n" " \t\treturn;\n" " \n" "@@ -271,8 +271,8 @@ static void __init build_device_resources(struct of_device *op,\n" @@ -236,7 +236,7 @@ " \n" "-\tpreg = of_get_property(op->node, bus->addr_prop_name, &num_reg);\n" "+\tpreg = of_get_property(op->dev.of_node, bus->addr_prop_name, &num_reg);\n" - " \tif (!preg || num_reg == 0)\n" + " \tif (!preg || num_reg = 0)\n" " \t\treturn;\n" " \n" "@@ -340,7 +340,7 @@ static void __init build_device_resources(struct of_device *op,\n" @@ -326,8 +326,8 @@ " \tstruct of_device *op = to_of_device(dev);\n" " \tstruct device_node *dp = data;\n" " \n" - "-\treturn (op->node == dp);\n" - "+\treturn (op->dev.of_node == dp);\n" + "-\treturn (op->node = dp);\n" + "+\treturn (op->dev.of_node = dp);\n" " }\n" " \n" " struct of_device *of_find_device_by_node(struct device_node *dp)\n" @@ -566,8 +566,7 @@ "@@ -1068,7 +1068,7 @@ static void __devinit schizo_scan_bus(struct pci_pbm_info *pbm,\n" " {\n" " \tpbm_config_busmastering(pbm);\n" - " \tpbm->is_66mhz_capable =\n" - "-\t\t(of_find_property(pbm->op->node, \"66mhz-capable\", NULL)\n" + " \tpbm->is_66mhz_capable -\t\t(of_find_property(pbm->op->node, \"66mhz-capable\", NULL)\n" "+\t\t(of_find_property(pbm->op->dev.of_node, \"66mhz-capable\", NULL)\n" " \t\t != NULL);\n" " \n" @@ -793,4 +792,4 @@ " \t/* On an Enterprise system there can be multiple mostek clocks.\n" " \t * We should only match the one that is on the central FHC bus." -170a8c75dc9176f818fff1bc8b142681c6e4f7756e8ac12517b5a788f59cb8a8 +b0ce31fab7055a264d9277b8dddb49701d50bcb137d90776c618280fa58a897d
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.