diff for duplicates of <20100318152238.21082.10985.stgit@angua> diff --git a/a/1.txt b/N1/1.txt index 7d9845c..9e3f91c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -154,7 +154,7 @@ index 2bc2dbe..4635b55 100644 - ata_irq = irq_of_parse_and_map(op->node, 0); + ata_irq = irq_of_parse_and_map(op->dev.of_node, 0); - if (ata_irq == NO_IRQ) { + if (ata_irq = NO_IRQ) { dev_err(&op->dev, "error mapping irq\n"); return -EINVAL; diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c @@ -362,7 +362,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/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c @@ -419,7 +419,7 @@ index 78a15af..0123a6e 100644 - prop = of_get_property(op->node, "clock-frequency", &plen); + prop = of_get_property(op->dev.of_node, "clock-frequency", + &plen); - if (prop && plen == sizeof(u32)) + if (prop && plen = sizeof(u32)) clock = *prop; } @@ -451,7 +451,7 @@ index 850ee45..9697de9 100644 +++ b/drivers/ide/pmac.c @@ -1152,7 +1152,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) - if (macio_resource_count(mdev) == 0) { + if (macio_resource_count(mdev) = 0) { printk(KERN_WARNING "ide-pmac: no address for %s\n", - mdev->ofdev.node->full_name); + mdev->ofdev.dev.of_node->full_name); @@ -469,7 +469,7 @@ index 850ee45..9697de9 100644 } @@ -1172,7 +1172,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) */ - if (macio_irq_count(mdev) == 0) { + if (macio_irq_count(mdev) = 0) { printk(KERN_WARNING "ide-pmac: no intrs for device %s, using " - "13\n", mdev->ofdev.node->full_name); + "13\n", mdev->ofdev.dev.of_node->full_name); @@ -563,8 +563,8 @@ index 8298e1f..f154153 100644 } /* Get IRQ for the device */ -- if (of_irq_to_resource(ofdev->node, 0, &r_irq) == NO_IRQ) { -+ if (of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq) == NO_IRQ) { +- if (of_irq_to_resource(ofdev->node, 0, &r_irq) = NO_IRQ) { ++ if (of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq) = NO_IRQ) { dev_err(dev, "no IRQ found\n"); return -ENODEV; } @@ -695,9 +695,9 @@ index 93fb320..6a715d0 100644 /* Get i2s-a node */ - while ((i2s = of_get_next_child(mdev->ofdev.node, i2s)) != NULL) + while ((i2s = of_get_next_child(mdev->ofdev.dev.of_node, i2s)) != NULL) - if (strcmp(i2s->name, "i2s-a") == 0) + if (strcmp(i2s->name, "i2s-a") = 0) break; - if (i2s == NULL) { + if (i2s = NULL) { @@ -430,7 +430,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev, of_address_to_resource(i2s, 1, &rdma)) { printk(KERN_ERR @@ -817,7 +817,7 @@ index ae30fb6..4a60795 100644 - ctrl->irq = of_irq_to_resource(ofdev->node, 0, NULL); + ctrl->irq = of_irq_to_resource(ofdev->dev.of_node, 0, NULL); - if (ctrl->irq == NO_IRQ) { + if (ctrl->irq = NO_IRQ) { dev_err(&ofdev->dev, "failed to get irq resource\n"); ret = -ENODEV; @@ -1058,7 +1058,7 @@ static int __devinit fsl_elbc_ctrl_probe(struct of_device *ofdev, @@ -1004,13 +1004,13 @@ index 2b9c1cb..04be634 100644 --- a/drivers/net/greth.c +++ b/drivers/net/greth.c @@ -1499,7 +1499,8 @@ static int __devinit greth_of_probe(struct of_device *ofdev, const struct of_dev - if (i == 6) { + if (i = 6) { const unsigned char *addr; int len; - addr = of_get_property(ofdev->node, "local-mac-address", &len); + addr = of_get_property(ofdev->dev.of_node, "local-mac-address", + &len); - if (addr != NULL && len == 6) { + if (addr != NULL && len = 6) { for (i = 0; i < 6; i++) macaddr[i] = (unsigned int) addr[i]; diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c @@ -1143,7 +1143,7 @@ index 2a2fc17..29ed695 100644 - prop = of_get_property(ofdev->node, "num-tx-chans", NULL); + prop = of_get_property(ofdev->dev.of_node, "num-tx-chans", NULL); - if (prop == NULL) { + if (prop = NULL) { printk(KERN_ERR "mal%d: can't find MAL num-tx-chans property!\n", @@ -551,7 +551,7 @@ static int __devinit mal_probe(struct of_device *ofdev, @@ -1152,7 +1152,7 @@ index 2a2fc17..29ed695 100644 - prop = of_get_property(ofdev->node, "num-rx-chans", NULL); + prop = of_get_property(ofdev->dev.of_node, "num-rx-chans", NULL); - if (prop == NULL) { + if (prop = NULL) { printk(KERN_ERR "mal%d: can't find MAL num-rx-chans property!\n", @@ -561,14 +561,14 @@ static int __devinit mal_probe(struct of_device *ofdev, @@ -1161,7 +1161,7 @@ index 2a2fc17..29ed695 100644 - dcr_base = dcr_resource_start(ofdev->node, 0); + dcr_base = dcr_resource_start(ofdev->dev.of_node, 0); - if (dcr_base == 0) { + if (dcr_base = 0) { printk(KERN_ERR "mal%d: can't find DCR resource!\n", index); err = -ENODEV; @@ -1207,7 +1207,7 @@ index 2a2fc17..29ed695 100644 + mal->rxde_irq = irq_of_parse_and_map(ofdev->dev.of_node, 4); } - if (mal->txeob_irq == NO_IRQ || mal->rxeob_irq == NO_IRQ || + if (mal->txeob_irq = NO_IRQ || mal->rxeob_irq = NO_IRQ || @@ -628,7 +628,7 @@ static int __devinit mal_probe(struct of_device *ofdev, /* Current Axon is not happy with priority being non-0, it can * deadlock, fix it up here @@ -1424,7 +1424,7 @@ index 0678f31..1fcf1ac 100644 @@ -9244,7 +9244,7 @@ static int __devinit niu_get_of_props(struct niu *np) int prop_len; - if (np->parent->plat_type == PLAT_TYPE_NIU) + if (np->parent->plat_type = PLAT_TYPE_NIU) - dp = np->op->node; + dp = np->op->dev.of_node; else @@ -1602,7 +1602,7 @@ index be637dc..9864f4f 100644 - i = of_getintprop_default(op->node, "channel#", -1); + i = of_getintprop_default(op->dev.of_node, "channel#", -1); - if (i == -1) + if (i = -1) goto fail; qe->channel = i; diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c @@ -1632,7 +1632,7 @@ index 1a74594..40b8fdc 100644 /* Get IRQ for the device */ - rc = of_irq_to_resource(ofdev->node, 0, &r_irq); + rc = of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq); - if (rc == NO_IRQ) { + if (rc = NO_IRQ) { dev_err(dev, "no IRQ found\n"); return rc; @@ -1183,7 +1183,7 @@ static int __devinit xemaclite_of_probe(struct of_device *ofdev, @@ -1699,8 +1699,8 @@ index 224ae6b..24068bb 100644 int of_device_register(struct of_device *ofdev) { -- BUG_ON(ofdev->node == NULL); -+ BUG_ON(ofdev->dev.of_node == NULL); +- BUG_ON(ofdev->node = NULL); ++ BUG_ON(ofdev->dev.of_node = NULL); device_initialize(&ofdev->dev); @@ -1736,8 +1736,8 @@ index e690a2a..604ba96 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 */ @@ -1749,8 +1749,8 @@ index 12090f5..01d794a 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; } /** @@ -1913,7 +1913,7 @@ index fa34b92..7374fbe 100644 + dp = op->dev.of_node; qpti->scsi_id = of_getintprop_default(dp, "initiator-id", -1); - if (qpti->scsi_id == -1) + if (qpti->scsi_id = -1) @@ -776,8 +776,8 @@ static void qpti_get_bursts(struct qlogicpti *qpti) struct of_device *op = qpti->op; u8 bursts, bmask; @@ -1924,7 +1924,7 @@ index fa34b92..7374fbe 100644 + bmask = of_getintprop_default(op->dev.of_node->parent, "burst-sizes", 0xff); if (bmask != 0xff) bursts &= bmask; - if (bursts == 0xff || + if (bursts = 0xff || @@ -1293,7 +1293,7 @@ static struct scsi_host_template qpti_template = { static int __devinit qpti_sbus_probe(struct of_device *op, const struct of_device_id *match) { @@ -2024,8 +2024,8 @@ index fe91319..52015d7 100644 i = 0; for (i = 0; i < grlib_apbuart_port_nr; i++) { -- if (op->node == grlib_apbuart_nodes[i]) -+ if (op->dev.of_node == grlib_apbuart_nodes[i]) +- if (op->node = grlib_apbuart_nodes[i]) ++ if (op->dev.of_node = grlib_apbuart_nodes[i]) break; } @@ -2037,8 +2037,8 @@ index 3119fdd..cb07938 100644 /* Check validity & presence */ for (idx = 0; idx < MPC52xx_PSC_MAXNUM; idx++) -- if (mpc52xx_uart_nodes[idx] == op->node) -+ if (mpc52xx_uart_nodes[idx] == op->dev.of_node) +- if (mpc52xx_uart_nodes[idx] = op->node) ++ if (mpc52xx_uart_nodes[idx] = op->dev.of_node) break; if (idx >= MPC52xx_PSC_MAXNUM) return -EINVAL; @@ -2047,7 +2047,7 @@ index 3119fdd..cb07938 100644 - uartclk = psc_ops->getuartclk(op->node); + uartclk = psc_ops->getuartclk(op->dev.of_node); - if (uartclk == 0) { + if (uartclk = 0) { dev_dbg(&op->dev, "Could not find uart clock frequency!\n"); return -EINVAL; @@ -1355,7 +1355,7 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match) @@ -2065,7 +2065,7 @@ index 3119fdd..cb07938 100644 - psc_ops->get_irq(port, op->node); + psc_ops->get_irq(port, op->dev.of_node); - if (port->irq == NO_IRQ) { + if (port->irq = NO_IRQ) { dev_dbg(&op->dev, "Could not get irq\n"); return -EINVAL; diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c @@ -2078,7 +2078,7 @@ index e1ab8ec..3c02fa9 100644 - dn = to_of_device(port->dev)->node; + dn = to_of_device(port->dev)->dev.of_node; - if (dn == NULL) + if (dn = NULL) goto out; diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c @@ -2111,8 +2111,8 @@ index f020de1..8abbbb3 100644 /* Iterate the pmz_ports array to find a matching entry */ for (i = 0; i < MAX_ZS_PORTS; i++) -- if (pmz_ports[i].node == mdev->ofdev.node) { -+ if (pmz_ports[i].node == mdev->ofdev.dev.of_node) { +- if (pmz_ports[i].node = mdev->ofdev.node) { ++ if (pmz_ports[i].node = mdev->ofdev.dev.of_node) { struct uart_pmac_port *uap = &pmz_ports[i]; uap->dev = mdev; @@ -2166,7 +2166,7 @@ index 170d3d6..2ab82ed 100644 printk("%s: %s port at %llx, irq %u\n", - to_of_device(up->port.dev)->node->full_name, + to_of_device(up->port.dev)->dev.of_node->full_name, - (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse", + (up->su_type = SU_PORT_KBD) ? "Keyboard" : "Mouse", (unsigned long long) up->port.mapbase, up->port.irq); @@ -1351,7 +1351,7 @@ static int __init sunsu_console_setup(struct console *co, char *options) @@ -2268,7 +2268,7 @@ index 0474786..f12cfd9 100644 + regaddr64 = of_translate_address(op->dev.of_node, regaddr_p); /* get PSC id (1..6, used by port_config) */ - if (op->dev.platform_data == NULL) { + if (op->dev.platform_data = NULL) { const u32 *psc_nump; - psc_nump = of_get_property(op->node, "cell-index", NULL); @@ -2282,7 +2282,7 @@ index 0474786..f12cfd9 100644 rc = mpc52xx_psc_spi_do_probe(&op->dev, (u32)regaddr64, (u32)size64, - irq_of_parse_and_map(op->node, 0), id); + irq_of_parse_and_map(op->dev.of_node, 0), id); - if (rc == 0) + if (rc = 0) - of_register_spi_devices(dev_get_drvdata(&op->dev), op->node); + of_register_spi_devices(dev_get_drvdata(&op->dev), + op->dev.of_node); @@ -2531,7 +2531,7 @@ index 7a437da..da38f2b 100644 /* by breaking out we keep a reference */ - while ((sound = of_get_next_child(sdev->ofdev.node, sound))) { + while ((sound = of_get_next_child(sdev->ofdev.dev.of_node, sound))) { - if (sound->type && strcasecmp(sound->type, "soundchip") == 0) + if (sound->type && strcasecmp(sound->type, "soundchip") = 0) break; } diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c diff --git a/a/content_digest b/N1/content_digest index 8ecb94e..d5540ee 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 06/10] of/drivers: Always use struct device.of_node to get node pointer\0" - "Date\0Thu, 18 Mar 2010 09:22:39 -0600\0" + "Subject\0[V2 PATCH 06/10] of/drivers: Always use struct device.of_node to get\0" + "Date\0Thu, 18 Mar 2010 15:22:39 +0000\0" "To\0davem@davemloft.net" benh@kernel.crashing.org linux-kernel@vger.kernel.org @@ -167,7 +167,7 @@ " \n" "-\tata_irq = irq_of_parse_and_map(op->node, 0);\n" "+\tata_irq = irq_of_parse_and_map(op->dev.of_node, 0);\n" - " \tif (ata_irq == NO_IRQ) {\n" + " \tif (ata_irq = NO_IRQ) {\n" " \t\tdev_err(&op->dev, \"error mapping irq\\n\");\n" " \t\treturn -EINVAL;\n" "diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c\n" @@ -375,7 +375,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/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c\n" @@ -432,7 +432,7 @@ "-\t\tprop = of_get_property(op->node, \"clock-frequency\", &plen);\n" "+\t\tprop = of_get_property(op->dev.of_node, \"clock-frequency\",\n" "+\t\t\t\t\t&plen);\n" - " \t\tif (prop && plen == sizeof(u32))\n" + " \t\tif (prop && plen = sizeof(u32))\n" " \t\t\tclock = *prop;\n" " \t}\n" " \n" @@ -464,7 +464,7 @@ "+++ b/drivers/ide/pmac.c\n" "@@ -1152,7 +1152,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)\n" " \n" - " \tif (macio_resource_count(mdev) == 0) {\n" + " \tif (macio_resource_count(mdev) = 0) {\n" " \t\tprintk(KERN_WARNING \"ide-pmac: no address for %s\\n\",\n" "-\t\t\t\t mdev->ofdev.node->full_name);\n" "+\t\t\t\t mdev->ofdev.dev.of_node->full_name);\n" @@ -482,7 +482,7 @@ " \t}\n" "@@ -1172,7 +1172,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)\n" " \t */\n" - " \tif (macio_irq_count(mdev) == 0) {\n" + " \tif (macio_irq_count(mdev) = 0) {\n" " \t\tprintk(KERN_WARNING \"ide-pmac: no intrs for device %s, using \"\n" "-\t\t\t\t \"13\\n\", mdev->ofdev.node->full_name);\n" "+\t\t\t\t \"13\\n\", mdev->ofdev.dev.of_node->full_name);\n" @@ -576,8 +576,8 @@ " \t}\n" " \n" " \t/* Get IRQ for the device */\n" - "-\tif (of_irq_to_resource(ofdev->node, 0, &r_irq) == NO_IRQ) {\n" - "+\tif (of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq) == NO_IRQ) {\n" + "-\tif (of_irq_to_resource(ofdev->node, 0, &r_irq) = NO_IRQ) {\n" + "+\tif (of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq) = NO_IRQ) {\n" " \t\tdev_err(dev, \"no IRQ found\\n\");\n" " \t\treturn -ENODEV;\n" " \t}\n" @@ -708,9 +708,9 @@ " \t/* Get i2s-a node */\n" "-\twhile ((i2s = of_get_next_child(mdev->ofdev.node, i2s)) != NULL)\n" "+\twhile ((i2s = of_get_next_child(mdev->ofdev.dev.of_node, i2s)) != NULL)\n" - " \t if (strcmp(i2s->name, \"i2s-a\") == 0)\n" + " \t if (strcmp(i2s->name, \"i2s-a\") = 0)\n" " \t\t break;\n" - " \tif (i2s == NULL) {\n" + " \tif (i2s = NULL) {\n" "@@ -430,7 +430,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev,\n" " \t of_address_to_resource(i2s, 1, &rdma)) {\n" " \t\tprintk(KERN_ERR\n" @@ -830,7 +830,7 @@ " \n" "-\tctrl->irq = of_irq_to_resource(ofdev->node, 0, NULL);\n" "+\tctrl->irq = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);\n" - " \tif (ctrl->irq == NO_IRQ) {\n" + " \tif (ctrl->irq = NO_IRQ) {\n" " \t\tdev_err(&ofdev->dev, \"failed to get irq resource\\n\");\n" " \t\tret = -ENODEV;\n" "@@ -1058,7 +1058,7 @@ static int __devinit fsl_elbc_ctrl_probe(struct of_device *ofdev,\n" @@ -1017,13 +1017,13 @@ "--- a/drivers/net/greth.c\n" "+++ b/drivers/net/greth.c\n" "@@ -1499,7 +1499,8 @@ static int __devinit greth_of_probe(struct of_device *ofdev, const struct of_dev\n" - " \tif (i == 6) {\n" + " \tif (i = 6) {\n" " \t\tconst unsigned char *addr;\n" " \t\tint len;\n" "-\t\taddr = of_get_property(ofdev->node, \"local-mac-address\", &len);\n" "+\t\taddr = of_get_property(ofdev->dev.of_node, \"local-mac-address\",\n" "+\t\t\t\t\t&len);\n" - " \t\tif (addr != NULL && len == 6) {\n" + " \t\tif (addr != NULL && len = 6) {\n" " \t\t\tfor (i = 0; i < 6; i++)\n" " \t\t\t\tmacaddr[i] = (unsigned int) addr[i];\n" "diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c\n" @@ -1156,7 +1156,7 @@ " \n" "-\tprop = of_get_property(ofdev->node, \"num-tx-chans\", NULL);\n" "+\tprop = of_get_property(ofdev->dev.of_node, \"num-tx-chans\", NULL);\n" - " \tif (prop == NULL) {\n" + " \tif (prop = NULL) {\n" " \t\tprintk(KERN_ERR\n" " \t\t \"mal%d: can't find MAL num-tx-chans property!\\n\",\n" "@@ -551,7 +551,7 @@ static int __devinit mal_probe(struct of_device *ofdev,\n" @@ -1165,7 +1165,7 @@ " \n" "-\tprop = of_get_property(ofdev->node, \"num-rx-chans\", NULL);\n" "+\tprop = of_get_property(ofdev->dev.of_node, \"num-rx-chans\", NULL);\n" - " \tif (prop == NULL) {\n" + " \tif (prop = NULL) {\n" " \t\tprintk(KERN_ERR\n" " \t\t \"mal%d: can't find MAL num-rx-chans property!\\n\",\n" "@@ -561,14 +561,14 @@ static int __devinit mal_probe(struct of_device *ofdev,\n" @@ -1174,7 +1174,7 @@ " \n" "-\tdcr_base = dcr_resource_start(ofdev->node, 0);\n" "+\tdcr_base = dcr_resource_start(ofdev->dev.of_node, 0);\n" - " \tif (dcr_base == 0) {\n" + " \tif (dcr_base = 0) {\n" " \t\tprintk(KERN_ERR\n" " \t\t \"mal%d: can't find DCR resource!\\n\", index);\n" " \t\terr = -ENODEV;\n" @@ -1220,7 +1220,7 @@ "+\t\tmal->rxde_irq = irq_of_parse_and_map(ofdev->dev.of_node, 4);\n" " \t}\n" " \n" - " \tif (mal->txeob_irq == NO_IRQ || mal->rxeob_irq == NO_IRQ ||\n" + " \tif (mal->txeob_irq = NO_IRQ || mal->rxeob_irq = NO_IRQ ||\n" "@@ -628,7 +628,7 @@ static int __devinit mal_probe(struct of_device *ofdev,\n" " \t/* Current Axon is not happy with priority being non-0, it can\n" " \t * deadlock, fix it up here\n" @@ -1437,7 +1437,7 @@ "@@ -9244,7 +9244,7 @@ static int __devinit niu_get_of_props(struct niu *np)\n" " \tint prop_len;\n" " \n" - " \tif (np->parent->plat_type == PLAT_TYPE_NIU)\n" + " \tif (np->parent->plat_type = PLAT_TYPE_NIU)\n" "-\t\tdp = np->op->node;\n" "+\t\tdp = np->op->dev.of_node;\n" " \telse\n" @@ -1615,7 +1615,7 @@ " \n" "-\ti = of_getintprop_default(op->node, \"channel#\", -1);\n" "+\ti = of_getintprop_default(op->dev.of_node, \"channel#\", -1);\n" - " \tif (i == -1)\n" + " \tif (i = -1)\n" " \t\tgoto fail;\n" " \tqe->channel = i;\n" "diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c\n" @@ -1645,7 +1645,7 @@ " \t/* Get IRQ for the device */\n" "-\trc = of_irq_to_resource(ofdev->node, 0, &r_irq);\n" "+\trc = of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq);\n" - " \tif (rc == NO_IRQ) {\n" + " \tif (rc = NO_IRQ) {\n" " \t\tdev_err(dev, \"no IRQ found\\n\");\n" " \t\treturn rc;\n" "@@ -1183,7 +1183,7 @@ static int __devinit xemaclite_of_probe(struct of_device *ofdev,\n" @@ -1712,8 +1712,8 @@ " \n" " int of_device_register(struct of_device *ofdev)\n" " {\n" - "-\tBUG_ON(ofdev->node == NULL);\n" - "+\tBUG_ON(ofdev->dev.of_node == NULL);\n" + "-\tBUG_ON(ofdev->node = NULL);\n" + "+\tBUG_ON(ofdev->dev.of_node = NULL);\n" " \n" " \tdevice_initialize(&ofdev->dev);\n" " \n" @@ -1749,8 +1749,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" @@ -1762,8 +1762,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" @@ -1926,7 +1926,7 @@ "+\tdp = op->dev.of_node;\n" " \n" " \tqpti->scsi_id = of_getintprop_default(dp, \"initiator-id\", -1);\n" - " \tif (qpti->scsi_id == -1)\n" + " \tif (qpti->scsi_id = -1)\n" "@@ -776,8 +776,8 @@ static void qpti_get_bursts(struct qlogicpti *qpti)\n" " \tstruct of_device *op = qpti->op;\n" " \tu8 bursts, bmask;\n" @@ -1937,7 +1937,7 @@ "+\tbmask = of_getintprop_default(op->dev.of_node->parent, \"burst-sizes\", 0xff);\n" " \tif (bmask != 0xff)\n" " \t\tbursts &= bmask;\n" - " \tif (bursts == 0xff ||\n" + " \tif (bursts = 0xff ||\n" "@@ -1293,7 +1293,7 @@ static struct scsi_host_template qpti_template = {\n" " static int __devinit qpti_sbus_probe(struct of_device *op, const struct of_device_id *match)\n" " {\n" @@ -2037,8 +2037,8 @@ " \n" " \ti = 0;\n" " \tfor (i = 0; i < grlib_apbuart_port_nr; i++) {\n" - "-\t\tif (op->node == grlib_apbuart_nodes[i])\n" - "+\t\tif (op->dev.of_node == grlib_apbuart_nodes[i])\n" + "-\t\tif (op->node = grlib_apbuart_nodes[i])\n" + "+\t\tif (op->dev.of_node = grlib_apbuart_nodes[i])\n" " \t\t\tbreak;\n" " \t}\n" " \n" @@ -2050,8 +2050,8 @@ " \n" " \t/* Check validity & presence */\n" " \tfor (idx = 0; idx < MPC52xx_PSC_MAXNUM; idx++)\n" - "-\t\tif (mpc52xx_uart_nodes[idx] == op->node)\n" - "+\t\tif (mpc52xx_uart_nodes[idx] == op->dev.of_node)\n" + "-\t\tif (mpc52xx_uart_nodes[idx] = op->node)\n" + "+\t\tif (mpc52xx_uart_nodes[idx] = op->dev.of_node)\n" " \t\t\tbreak;\n" " \tif (idx >= MPC52xx_PSC_MAXNUM)\n" " \t\treturn -EINVAL;\n" @@ -2060,7 +2060,7 @@ " \n" "-\tuartclk = psc_ops->getuartclk(op->node);\n" "+\tuartclk = psc_ops->getuartclk(op->dev.of_node);\n" - " \tif (uartclk == 0) {\n" + " \tif (uartclk = 0) {\n" " \t\tdev_dbg(&op->dev, \"Could not find uart clock frequency!\\n\");\n" " \t\treturn -EINVAL;\n" "@@ -1355,7 +1355,7 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)\n" @@ -2078,7 +2078,7 @@ " \n" "-\tpsc_ops->get_irq(port, op->node);\n" "+\tpsc_ops->get_irq(port, op->dev.of_node);\n" - " \tif (port->irq == NO_IRQ) {\n" + " \tif (port->irq = NO_IRQ) {\n" " \t\tdev_dbg(&op->dev, \"Could not get irq\\n\");\n" " \t\treturn -EINVAL;\n" "diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c\n" @@ -2091,7 +2091,7 @@ " \n" "-\tdn = to_of_device(port->dev)->node;\n" "+\tdn = to_of_device(port->dev)->dev.of_node;\n" - " \tif (dn == NULL)\n" + " \tif (dn = NULL)\n" " \t\tgoto out;\n" " \n" "diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c\n" @@ -2124,8 +2124,8 @@ " \t/* Iterate the pmz_ports array to find a matching entry\n" " \t */\n" " \tfor (i = 0; i < MAX_ZS_PORTS; i++)\n" - "-\t\tif (pmz_ports[i].node == mdev->ofdev.node) {\n" - "+\t\tif (pmz_ports[i].node == mdev->ofdev.dev.of_node) {\n" + "-\t\tif (pmz_ports[i].node = mdev->ofdev.node) {\n" + "+\t\tif (pmz_ports[i].node = mdev->ofdev.dev.of_node) {\n" " \t\t\tstruct uart_pmac_port *uap = &pmz_ports[i];\n" " \n" " \t\t\tuap->dev = mdev;\n" @@ -2179,7 +2179,7 @@ " \tprintk(\"%s: %s port at %llx, irq %u\\n\",\n" "-\t to_of_device(up->port.dev)->node->full_name,\n" "+\t to_of_device(up->port.dev)->dev.of_node->full_name,\n" - " \t (up->su_type == SU_PORT_KBD) ? \"Keyboard\" : \"Mouse\",\n" + " \t (up->su_type = SU_PORT_KBD) ? \"Keyboard\" : \"Mouse\",\n" " \t (unsigned long long) up->port.mapbase,\n" " \t up->port.irq);\n" "@@ -1351,7 +1351,7 @@ static int __init sunsu_console_setup(struct console *co, char *options)\n" @@ -2281,7 +2281,7 @@ "+\tregaddr64 = of_translate_address(op->dev.of_node, regaddr_p);\n" " \n" " \t/* get PSC id (1..6, used by port_config) */\n" - " \tif (op->dev.platform_data == NULL) {\n" + " \tif (op->dev.platform_data = NULL) {\n" " \t\tconst u32 *psc_nump;\n" " \n" "-\t\tpsc_nump = of_get_property(op->node, \"cell-index\", NULL);\n" @@ -2295,7 +2295,7 @@ " \trc = mpc52xx_psc_spi_do_probe(&op->dev, (u32)regaddr64, (u32)size64,\n" "-\t\t\t\t\tirq_of_parse_and_map(op->node, 0), id);\n" "+\t\t\t\tirq_of_parse_and_map(op->dev.of_node, 0), id);\n" - " \tif (rc == 0)\n" + " \tif (rc = 0)\n" "-\t\tof_register_spi_devices(dev_get_drvdata(&op->dev), op->node);\n" "+\t\tof_register_spi_devices(dev_get_drvdata(&op->dev),\n" "+\t\t\t\t\top->dev.of_node);\n" @@ -2544,7 +2544,7 @@ " \t/* by breaking out we keep a reference */\n" "-\twhile ((sound = of_get_next_child(sdev->ofdev.node, sound))) {\n" "+\twhile ((sound = of_get_next_child(sdev->ofdev.dev.of_node, sound))) {\n" - " \t\tif (sound->type && strcasecmp(sound->type, \"soundchip\") == 0)\n" + " \t\tif (sound->type && strcasecmp(sound->type, \"soundchip\") = 0)\n" " \t\t\tbreak;\n" " \t}\n" "diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c\n" @@ -2688,4 +2688,4 @@ " \n" " \treturn 0;" -220b327401c32d54863d451236ec1df560f8a377022d0c8cfc35b52bacee486a +937bb84014d4287f7afedc61a8403627096a94f9064913a6498e3e065362dcde
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.