Skip to content

Commit

Permalink
of/sparc: fix build regression from of_device changes
Browse files Browse the repository at this point in the history
Commit id 1636f8a (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: David S. Miller <[email protected]>
Signed-off-by: Grant Likely <[email protected]>
  • Loading branch information
glikely committed Aug 8, 2010
1 parent 2dc1158 commit 19e4875
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/crypto/n2_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1580,7 +1580,7 @@ static int find_devino_index(struct platform_device *dev, struct spu_mdesc_info
if (!dev_intrs)
return -ENODEV;

for (i = 0; i < dev->num_irqs; i++) {
for (i = 0; i < dev->archdata.num_irqs; i++) {
if (dev_intrs[i] == intr)
return i;
}
Expand All @@ -1603,7 +1603,7 @@ static int spu_map_ino(struct platform_device *dev, struct spu_mdesc_info *ip,
if (index < 0)
return index;

p->irq = dev->irqs[index];
p->irq = dev->archdata.irqs[index];

sprintf(p->irq_name, "%s-%d", irq_name, index);

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/greth.c
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,7 @@ static int __devinit greth_of_probe(struct platform_device *ofdev, const struct
}

regs = (struct greth_regs *) greth->regs;
greth->irq = ofdev->irqs[0];
greth->irq = ofdev->archdata.irqs[0];

dev_set_drvdata(greth->dev, dev);
SET_NETDEV_DEV(dev, greth->dev);
Expand Down

0 comments on commit 19e4875

Please sign in to comment.