aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sunqe.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-04-13 19:12:29 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-05-18 18:10:44 -0400
commit61c7a080a5a061c976988fd4b844dfb468dda255 (patch)
tree8cb492b73f2755c38a6164d770da34d5af6486a0 /drivers/net/sunqe.c
parentd12d42f744f805a9ccc33cd76f04b237cd83ce56 (diff)
of: Always use 'struct device.of_node' to get device node pointer.
The following structure elements duplicate the information in 'struct device.of_node' and so are being eliminated. This patch makes all readers of these elements use device.of_node instead. (struct of_device *)->node (struct dev_archdata *)->prom_node (sparc) (struct dev_archdata *)->of_node (powerpc & microblaze) Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/net/sunqe.c')
-rw-r--r--drivers/net/sunqe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index be637dce944c..9864f4fa69d5 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -696,7 +696,7 @@ static void qe_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
696 strcpy(info->version, "3.0"); 696 strcpy(info->version, "3.0");
697 697
698 op = qep->op; 698 op = qep->op;
699 regs = of_get_property(op->node, "reg", NULL); 699 regs = of_get_property(op->dev.of_node, "reg", NULL);
700 if (regs) 700 if (regs)
701 sprintf(info->bus_info, "SBUS:%d", regs->which_io); 701 sprintf(info->bus_info, "SBUS:%d", regs->which_io);
702 702
@@ -800,7 +800,7 @@ static struct sunqec * __devinit get_qec(struct of_device *child)
800 if (qec_global_reset(qecp->gregs)) 800 if (qec_global_reset(qecp->gregs))
801 goto fail; 801 goto fail;
802 802
803 qecp->qec_bursts = qec_get_burst(op->node); 803 qecp->qec_bursts = qec_get_burst(op->dev.of_node);
804 804
805 qec_init_once(qecp, op); 805 qec_init_once(qecp, op);
806 806
@@ -858,7 +858,7 @@ static int __devinit qec_ether_init(struct of_device *op)
858 858
859 res = -ENODEV; 859 res = -ENODEV;
860 860
861 i = of_getintprop_default(op->node, "channel#", -1); 861 i = of_getintprop_default(op->dev.of_node, "channel#", -1);
862 if (i == -1) 862 if (i == -1)
863 goto fail; 863 goto fail;
864 qe->channel = i; 864 qe->channel = i;