diff for duplicates of <20100318152221.21082.46458.stgit@angua> diff --git a/a/1.txt b/N1/1.txt index 197823f..dde0519 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -44,7 +44,7 @@ index b83e447..e834880 100644 - node = dev->archdata.prom_node; + node = dev->of_node; if (node && - node == of_console_device) + node = of_console_device) return 1; diff --git a/arch/sparc/include/asm/floppy_64.h b/arch/sparc/include/asm/floppy_64.h index 36439d6..8fac3ab 100644 @@ -113,7 +113,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 @@ -193,7 +193,7 @@ index 4926c1b..7073117 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, @@ -240,7 +240,7 @@ index 5bc7416..c8e352e 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, @@ -330,8 +330,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) @@ -588,8 +588,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/N1/content_digest index cf9cf9d..e70e065 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020100318144836.21082.93040.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" - "Subject\0[V2 PATCH 03/10] arch/sparc: Always use 'struct device.of_node' to get device node pointer.\0" - "Date\0Thu, 18 Mar 2010 09:22:22 -0600\0" + "Subject\0[V2 PATCH 03/10] arch/sparc: Always use 'struct device.of_node' to\0" + "Date\0Thu, 18 Mar 2010 15:22:22 +0000\0" "To\0davem@davemloft.net" benh@kernel.crashing.org linux-kernel@vger.kernel.org @@ -57,7 +57,7 @@ "-\tnode = dev->archdata.prom_node;\n" "+\tnode = dev->of_node;\n" " \tif (node &&\n" - " \t node == of_console_device)\n" + " \t node = of_console_device)\n" " \t\treturn 1;\n" "diff --git a/arch/sparc/include/asm/floppy_64.h b/arch/sparc/include/asm/floppy_64.h\n" "index 36439d6..8fac3ab 100644\n" @@ -126,7 +126,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" @@ -206,7 +206,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" @@ -253,7 +253,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" @@ -343,8 +343,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" @@ -601,8 +601,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" @@ -828,4 +827,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." -c83f62ba93fdb8e0e23560c642150b220a3b9ffb91c00a7d323c151a4dae0e6e +cc26d7c4eb04bc173e62ba892abf6266be788fccdd25e7a5e66cf79763a1c5b0
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.