of/sparc: fix build regression from of_device changes

Commit id 1636f8ac2b08410df4766449f7c86b912443cd99 (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]>

diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index 931fdd471d6d60d89d7a9f9449b23738b8df22b2..88ee01510ec0132d894763dc9ac967b101ea0439 100644 (file)
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -1580,7 +1580,7 @@ static int find_devino_index(struct platform_device *dev, struct spu_mdesc_info
        if (!dev_intrs)
                return -ENODEV;
 
        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;
        }
                if (dev_intrs[i] == intr)
                        return i;
        }


@@ -1603,7 +1603,7 @@ static int spu_map_ino(struct platform_device *dev, struct spu_mdesc_info *ip,
        if (index < 0)
                return index;
 
        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);
 
 
        sprintf(p->irq_name, "%s-%d", irq_name, index);
 

diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index 9ec4b7f28ca40f8003b5a0147458fa0b9e6f6fec..f15c64f1cd3886a77ec09354c7caf3408eba14b4 100644 (file)
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -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);
        SET_NETDEV_DEV(dev, greth->dev);
 
        dev_set_drvdata(greth->dev, dev);
        SET_NETDEV_DEV(dev, greth->dev);