Re: [V2 PATCH 06/10] of/drivers: Always use struct device.of_node to get node pointer
From: Sean MacLennan <hidden>
Date: 2010-03-18 17:10:52
Also in:
lkml, sparclinux
Subsystem:
memory technology devices (mtd), nand flash subsystem, the rest · Maintainers:
Miquel Raynal, Richard Weinberger, Vignesh Raghavendra, Linus Torvalds
On Thu, 18 Mar 2010 11:07:35 -0600 Grant Likely [off-list ref] wrote:
On Thu, Mar 18, 2010 at 10:59 AM, Sean MacLennan [off-list ref] wrote:quoted
On Thu, 18 Mar 2010 09:22:39 -0600 Grant Likely [off-list ref] wrote:quoted
The following structure elements duplicate the information in 'struct device.of_node' and so are being eliminated. =A0This patches makes all readers of the following elements use device.of_node instead.The NDFC driver also needs a patch... or at least the version from your last of_patch set does. I am included the patch I needed to get it to compile.=20 Thanks Sean, I've added this patch to my series. s-o-b line please? =20 g.
Signed-off-by: Sean MacLennan <redacted> ---
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 19d94a2..5a232ec 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c@@ -238,14 +238,14 @@ static int __devinit ndfc_probe(struct of_device *ofd=ev,
dev_set_drvdata(&ofdev->dev, ndfc);
=20
/* Read the reg property to get the chip select */
- reg =3D of_get_property(ofdev->node, "reg", &len);
+ reg =3D of_get_property(ofdev->dev.of_node, "reg", &len);
if (reg =3D=3D NULL || len !=3D 12) {
dev_err(&ofdev->dev, "unable read reg property (%d)\n", len);
return -ENOENT;
}
ndfc->chip_select =3D reg[0];
=20
- ndfc->ndfcbase =3D of_iomap(ofdev->node, 0);
+ ndfc->ndfcbase =3D of_iomap(ofdev->dev.of_node, 0);
if (!ndfc->ndfcbase) {
dev_err(&ofdev->dev, "failed to get memory\n");
return -EIO;@@ -254,20 +254,20 @@ static int __devinit ndfc_probe(struct of_device *ofd=ev,
ccr =3D NDFC_CCR_BS(ndfc->chip_select);
=20
/* It is ok if ccr does not exist - just default to 0 */
- reg =3D of_get_property(ofdev->node, "ccr", NULL);
+ reg =3D of_get_property(ofdev->dev.of_node, "ccr", NULL);
if (reg)
ccr |=3D *reg;
=20
out_be32(ndfc->ndfcbase + NDFC_CCR, ccr);
=20
/* Set the bank settings if given */
- reg =3D of_get_property(ofdev->node, "bank-settings", NULL);
+ reg =3D of_get_property(ofdev->dev.of_node, "bank-settings", NULL);
if (reg) {
int offset =3D NDFC_BCFG0 + (ndfc->chip_select << 2);
out_be32(ndfc->ndfcbase + offset, *reg);
}
=20
- err =3D ndfc_chip_init(ndfc, ofdev->node);
+ err =3D ndfc_chip_init(ndfc, ofdev->dev.of_node);
if (err) {
iounmap(ndfc->ndfcbase);
return err;