diff for duplicates of <20100318152227.21082.32956.stgit@angua> diff --git a/a/1.txt b/N1/1.txt index ba91aa4..c149c2c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -50,13 +50,13 @@ index a4c8b38..797e9ac 100644 - struct device_node *dn = to_of_device(dev)->node; + struct device_node *dn = to_of_device(dev)->dev.of_node; return (dn->full_name && - (strcasecmp((char *)data, dn->full_name) == 0)); + (strcasecmp((char *)data, dn->full_name) = 0)); } static int ibmebus_match_node(struct device *dev, void *data) { -- return to_of_device(dev)->node == data; -+ return to_of_device(dev)->dev.of_node == data; +- return to_of_device(dev)->node = data; ++ return to_of_device(dev)->dev.of_node = data; } static int ibmebus_create_device(struct device_node *dn) @@ -102,8 +102,8 @@ index 666d08d..5a5f624 100644 static int of_dev_node_match(struct device *dev, void *data) { -- return to_of_device(dev)->node == data; -+ return to_of_device(dev)->dev.of_node == data; +- return to_of_device(dev)->node = data; ++ return to_of_device(dev)->dev.of_node = data; } struct of_device *of_find_device_by_node(struct device_node *np) @@ -111,13 +111,13 @@ index 666d08d..5a5f624 100644 static int of_dev_phandle_match(struct device *dev, void *data) { phandle *ph = data; -- return to_of_device(dev)->node->phandle == *ph; -+ return to_of_device(dev)->dev.of_node->phandle == *ph; +- return to_of_device(dev)->node->phandle = *ph; ++ return to_of_device(dev)->dev.of_node->phandle = *ph; } struct of_device *of_find_device_by_phandle(phandle ph) @@ -247,10 +247,10 @@ static int __devinit of_pci_phb_probe(struct of_device *dev, - if (ppc_md.pci_setup_phb == NULL) + if (ppc_md.pci_setup_phb = NULL) return -ENODEV; - printk(KERN_INFO "Setting up PCI bus %s\n", dev->node->full_name); @@ -150,7 +150,7 @@ index 666d08d..5a5f624 100644 /* Scan the bus */ - pcibios_scan_phb(phb, dev->node); + pcibios_scan_phb(phb, dev->dev.of_node); - if (phb->bus == NULL) + if (phb->bus = NULL) return -ENXIO; diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c @@ -319,7 +319,7 @@ index 88f4ae7..88b21fc 100644 + device->dev.of_node->full_name); bank = kzalloc(sizeof(struct axon_ram_bank), GFP_KERNEL); - if (bank == NULL) { + if (bank = NULL) { @@ -198,7 +198,7 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id) bank->device = device; @@ -335,7 +335,7 @@ index 88f4ae7..88b21fc 100644 - bank->irq_id = irq_of_parse_and_map(device->node, 0); + bank->irq_id = irq_of_parse_and_map(device->dev.of_node, 0); - if (bank->irq_id == NO_IRQ) { + if (bank->irq_id = NO_IRQ) { dev_err(&device->dev, "Cannot access ECC interrupt ID\n"); rc = -EFAULT; diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c @@ -385,7 +385,7 @@ index e094367..d17841f 100644 + msi->irqhost = irq_alloc_host(dev->dev.of_node, IRQ_HOST_MAP_LINEAR, NR_MSI_IRQS, &fsl_msi_host_ops, 0); - if (msi->irqhost == NULL) { + if (msi->irqhost = NULL) { @@ -258,10 +258,10 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev, } diff --git a/a/content_digest b/N1/content_digest index ff88b26..5269fbe 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 04/10] arch/powerpc: Always use 'struct device.of_node' to get device node pointer.\0" - "Date\0Thu, 18 Mar 2010 09:22:28 -0600\0" + "Subject\0[V2 PATCH 04/10] arch/powerpc: Always use 'struct device.of_node' to\0" + "Date\0Thu, 18 Mar 2010 15:22:28 +0000\0" "To\0davem@davemloft.net" benh@kernel.crashing.org linux-kernel@vger.kernel.org @@ -63,13 +63,13 @@ "-\tstruct device_node *dn = to_of_device(dev)->node;\n" "+\tstruct device_node *dn = to_of_device(dev)->dev.of_node;\n" " \treturn (dn->full_name &&\n" - " \t\t(strcasecmp((char *)data, dn->full_name) == 0));\n" + " \t\t(strcasecmp((char *)data, dn->full_name) = 0));\n" " }\n" " \n" " static int ibmebus_match_node(struct device *dev, void *data)\n" " {\n" - "-\treturn to_of_device(dev)->node == data;\n" - "+\treturn to_of_device(dev)->dev.of_node == data;\n" + "-\treturn to_of_device(dev)->node = data;\n" + "+\treturn to_of_device(dev)->dev.of_node = data;\n" " }\n" " \n" " static int ibmebus_create_device(struct device_node *dn)\n" @@ -115,8 +115,8 @@ " \n" " static int of_dev_node_match(struct device *dev, void *data)\n" " {\n" - "-\treturn to_of_device(dev)->node == data;\n" - "+\treturn to_of_device(dev)->dev.of_node == data;\n" + "-\treturn to_of_device(dev)->node = data;\n" + "+\treturn to_of_device(dev)->dev.of_node = data;\n" " }\n" " \n" " struct of_device *of_find_device_by_node(struct device_node *np)\n" @@ -124,13 +124,13 @@ " static int of_dev_phandle_match(struct device *dev, void *data)\n" " {\n" " \tphandle *ph = data;\n" - "-\treturn to_of_device(dev)->node->phandle == *ph;\n" - "+\treturn to_of_device(dev)->dev.of_node->phandle == *ph;\n" + "-\treturn to_of_device(dev)->node->phandle = *ph;\n" + "+\treturn to_of_device(dev)->dev.of_node->phandle = *ph;\n" " }\n" " \n" " struct of_device *of_find_device_by_phandle(phandle ph)\n" "@@ -247,10 +247,10 @@ static int __devinit of_pci_phb_probe(struct of_device *dev,\n" - " \tif (ppc_md.pci_setup_phb == NULL)\n" + " \tif (ppc_md.pci_setup_phb = NULL)\n" " \t\treturn -ENODEV;\n" " \n" "-\tprintk(KERN_INFO \"Setting up PCI bus %s\\n\", dev->node->full_name);\n" @@ -163,7 +163,7 @@ " \t/* Scan the bus */\n" "-\tpcibios_scan_phb(phb, dev->node);\n" "+\tpcibios_scan_phb(phb, dev->dev.of_node);\n" - " \tif (phb->bus == NULL)\n" + " \tif (phb->bus = NULL)\n" " \t\treturn -ENXIO;\n" " \n" "diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c\n" @@ -332,7 +332,7 @@ "+\t\t\tdevice->dev.of_node->full_name);\n" " \n" " \tbank = kzalloc(sizeof(struct axon_ram_bank), GFP_KERNEL);\n" - " \tif (bank == NULL) {\n" + " \tif (bank = NULL) {\n" "@@ -198,7 +198,7 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)\n" " \n" " \tbank->device = device;\n" @@ -348,7 +348,7 @@ " \n" "-\tbank->irq_id = irq_of_parse_and_map(device->node, 0);\n" "+\tbank->irq_id = irq_of_parse_and_map(device->dev.of_node, 0);\n" - " \tif (bank->irq_id == NO_IRQ) {\n" + " \tif (bank->irq_id = NO_IRQ) {\n" " \t\tdev_err(&device->dev, \"Cannot access ECC interrupt ID\\n\");\n" " \t\trc = -EFAULT;\n" "diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c\n" @@ -398,7 +398,7 @@ "+\tmsi->irqhost = irq_alloc_host(dev->dev.of_node, IRQ_HOST_MAP_LINEAR,\n" " \t\t\t\t NR_MSI_IRQS, &fsl_msi_host_ops, 0);\n" " \n" - " \tif (msi->irqhost == NULL) {\n" + " \tif (msi->irqhost = NULL) {\n" "@@ -258,10 +258,10 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,\n" " \t}\n" " \n" @@ -468,4 +468,4 @@ " \n" " \tif (data) {" -b2b60b0c388d8708a80e9778259cb9af3924a0292d2b8cd9be50527b81d66a57 +0cdc14a0cc447adc143d93140cbad3e1c1ee87f9bb57b099927755c8e704ba6a
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.