Commit 19e4875f authored by Grant Likely's avatar Grant Likely

of/sparc: fix build regression from of_device changes

Commit id 1636f8ac (sparc/of: Move
of_device fields into struct pdev_archdata) missed fixing up the
n2_core.c and greth.c drivers.  This patch makes the required changes.
Reported-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 2dc11581
...@@ -1580,7 +1580,7 @@ static int find_devino_index(struct platform_device *dev, struct spu_mdesc_info ...@@ -1580,7 +1580,7 @@ static int find_devino_index(struct platform_device *dev, struct spu_mdesc_info
if (!dev_intrs) if (!dev_intrs)
return -ENODEV; return -ENODEV;
for (i = 0; i < dev->num_irqs; i++) { for (i = 0; i < dev->archdata.num_irqs; i++) {
if (dev_intrs[i] == intr) if (dev_intrs[i] == intr)
return i; return i;
} }
...@@ -1603,7 +1603,7 @@ static int spu_map_ino(struct platform_device *dev, struct spu_mdesc_info *ip, ...@@ -1603,7 +1603,7 @@ static int spu_map_ino(struct platform_device *dev, struct spu_mdesc_info *ip,
if (index < 0) if (index < 0)
return index; return index;
p->irq = dev->irqs[index]; p->irq = dev->archdata.irqs[index];
sprintf(p->irq_name, "%s-%d", irq_name, index); sprintf(p->irq_name, "%s-%d", irq_name, index);
......
...@@ -1412,7 +1412,7 @@ static int __devinit greth_of_probe(struct platform_device *ofdev, const struct ...@@ -1412,7 +1412,7 @@ static int __devinit greth_of_probe(struct platform_device *ofdev, const struct
} }
regs = (struct greth_regs *) greth->regs; regs = (struct greth_regs *) greth->regs;
greth->irq = ofdev->irqs[0]; greth->irq = ofdev->archdata.irqs[0];
dev_set_drvdata(greth->dev, dev); dev_set_drvdata(greth->dev, dev);
SET_NETDEV_DEV(dev, greth->dev); SET_NETDEV_DEV(dev, greth->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment