Skip to contentSkip to conversation

of/sparc: fix build regression from of_device changes

PATCH In review Grant Likely 2 participants 2 messages Aug 8, 2010

Subsystems (2)
Network drivers Crypto API
lore
Share & tools
lore

Grant Likely

author
#0 lore raw

PATCH 1/1 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]>

---

David, I've currently got this one in my next-devicetree branch. You can either pick it up, or it can go out when I ask Linus to pull on Monday or Tuesday.

g.

 drivers/crypto/n2_core.c |    4 ++--
 drivers/net/greth.c      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/crypto/n2_core.c +2 -2
index 26af2dd..3704e46 100644
@@ -1580,7 +1580,7 @@ static int find_devino_index(struct of_device *dev, struct spu_mdesc_info *ip,
 	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;
 	}

@@ -1603,7 +1603,7 @@ static int spu_map_ino(struct of_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);
drivers/net/greth.c +1 -1
index 4d09eab..ffe8bed 100644
@@ -1412,7 +1412,7 @@ static int __devinit greth_of_probe(struct of_device *ofdev, const struct of_dev
 	}
 
 	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);
maintainer
#1 lore raw

From: Grant Likely <[email protected]>
Date: Sun, 08 Aug 2010 01:19:38 -0600

Quoted 11 lines

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]>

---

David, I've currently got this one in my next-devicetree branch. You can either pick it up, or it can go out when I ask Linus to pull on Monday or Tuesday.

Please ask Linus to pull your copy, thanks Grant.