aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/niu.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/niu.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/niu.c')
-rw-r--r--drivers/net/niu.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index d5cd16bfc907..9c1604c04450 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -9094,7 +9094,7 @@ static int __devinit niu_n2_irq_init(struct niu *np, u8 *ldg_num_map)
9094 const u32 *int_prop; 9094 const u32 *int_prop;
9095 int i; 9095 int i;
9096 9096
9097 int_prop = of_get_property(op->node, "interrupts", NULL); 9097 int_prop = of_get_property(op->dev.of_node, "interrupts", NULL);
9098 if (!int_prop) 9098 if (!int_prop)
9099 return -ENODEV; 9099 return -ENODEV;
9100 9100
@@ -9245,7 +9245,7 @@ static int __devinit niu_get_of_props(struct niu *np)
9245 int prop_len; 9245 int prop_len;
9246 9246
9247 if (np->parent->plat_type == PLAT_TYPE_NIU) 9247 if (np->parent->plat_type == PLAT_TYPE_NIU)
9248 dp = np->op->node; 9248 dp = np->op->dev.of_node;
9249 else 9249 else
9250 dp = pci_device_to_OF_node(np->pdev); 9250 dp = pci_device_to_OF_node(np->pdev);
9251 9251
@@ -10056,10 +10056,10 @@ static int __devinit niu_of_probe(struct of_device *op,
10056 10056
10057 niu_driver_version(); 10057 niu_driver_version();
10058 10058
10059 reg = of_get_property(op->node, "reg", NULL); 10059 reg = of_get_property(op->dev.of_node, "reg", NULL);
10060 if (!reg) { 10060 if (!reg) {
10061 dev_err(&op->dev, "%s: No 'reg' property, aborting\n", 10061 dev_err(&op->dev, "%s: No 'reg' property, aborting\n",
10062 op->node->full_name); 10062 op->dev.of_node->full_name);
10063 return -ENODEV; 10063 return -ENODEV;
10064 } 10064 }
10065 10065
@@ -10072,7 +10072,7 @@ static int __devinit niu_of_probe(struct of_device *op,
10072 np = netdev_priv(dev); 10072 np = netdev_priv(dev);
10073 10073
10074 memset(&parent_id, 0, sizeof(parent_id)); 10074 memset(&parent_id, 0, sizeof(parent_id));
10075 parent_id.of = of_get_parent(op->node); 10075 parent_id.of = of_get_parent(op->dev.of_node);
10076 10076
10077 np->parent = niu_get_parent(np, &parent_id, 10077 np->parent = niu_get_parent(np, &parent_id,
10078 PLAT_TYPE_NIU); 10078 PLAT_TYPE_NIU);