diff for duplicates of <20100311180415.4824.29410.stgit@angua> diff --git a/a/content_digest b/N1/content_digest index e07fe1a..606e7cd 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 05/37] arch/powerpc: use .dev.of_node instead of .node in\tstruct of_device\0" + "Subject\0[PATCH 05/37] arch/powerpc: use .dev.of_node instead of .node in struct of_device\0" "Date\0Thu, 11 Mar 2010 11:04:15 -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" @@ -465,4 +478,4 @@ " \n" " \tif (data) {" -8b4322677cc8aaa5bd4e2e090aa3ab2a84525b6ab1f572c5ac833949b33c5b46 +86c0a20c16761a65037b96b8048873fd7246ed79ac0f38c7e08a3e8cfc6ea19a
diff --git a/a/1.txt b/N2/1.txt index 6e15203..9f857e5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -45,13 +45,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) @@ -97,8 +97,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) @@ -106,13 +106,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); @@ -145,7 +145,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 @@ -314,7 +314,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; @@ -330,7 +330,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 @@ -380,7 +380,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/N2/content_digest index e07fe1a..0a52100 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 05/37] arch/powerpc: use .dev.of_node instead of .node in\tstruct of_device\0" - "Date\0Thu, 11 Mar 2010 11:04:15 -0700\0" + "Subject\0[PATCH 05/37] arch/powerpc: use .dev.of_node instead of .node in\0" + "Date\0Thu, 11 Mar 2010 18:04:15 +0000\0" "To\0monstr@monstr.eu" gregkh@suse.de benh@kernel.crashing.org @@ -60,13 +60,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" @@ -112,8 +112,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" @@ -121,13 +121,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" @@ -160,7 +160,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" @@ -329,7 +329,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" @@ -345,7 +345,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" @@ -395,7 +395,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" @@ -465,4 +465,4 @@ " \n" " \tif (data) {" -8b4322677cc8aaa5bd4e2e090aa3ab2a84525b6ab1f572c5ac833949b33c5b46 +9de6e3f2026e1b01ad0f73684b3854bd71c9ebc17ca3c61af6dcb9e8c2f1db4a
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.