Thread (34 messages) 34 messages, 5 authors, 2011-03-11

[PATCH 2/8] macb: detect hclk presence from platform data

flat view
STALE5702d

From: Jamie Iles <hidden>
Date: 2011-03-10 11:45:19
Also in: netdev

Revision v1 of 12 in this series.

Revisions (12)
  1. v1
  2. v1
  3. v1
  4. v1 current
  5. v1
  6. v1
  7. v1
  8. v1
  9. v1
  10. v1
  11. v1
  12. v1 
On Thu, Mar 10, 2011 at 11:41:37AM +0000, Jamie Iles wrote:
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index bfd3601..8e6d8e3 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -246,9 +246,7 @@ static int macb_mii_init(struct macb *bp)
 	bp->mii_bus->parent = &bp->dev->dev;
 	pdata = bp->pdev->dev.platform_data;
 
-	if (pdata)
-		bp->mii_bus->phy_mask = pdata->phy_mask;
-
+	bp->mii_bus->phy_mask = pdata->phy_mask;
 	bp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
 	if (!bp->mii_bus->irq) {
 		err = -ENOMEM;
Doh, too hasty.  That hunk shouldn't be there now.  I'll fix that up for 
next time.

Jamie
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help