Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150019
b: refs/heads/master
c: fd84f0e
h: refs/heads/master
i:
  150017: 0ddbb8f
  150015: 0aeba74
v: v3
  • Loading branch information
Grant Likely authored and David S. Miller committed Apr 27, 2009
1 parent ac54259 commit 8c6110e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0b9da337dca972e7a4144e298ec3adb8f244d4a4
refs/heads/master: fd84f0ee50d3abedd11454b016823aa3ffcdc919
9 changes: 3 additions & 6 deletions trunk/arch/powerpc/platforms/82xx/ep8248e.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <linux/interrupt.h>
#include <linux/fsl_devices.h>
#include <linux/mdio-bitbang.h>
#include <linux/of_mdio.h>
#include <linux/of_platform.h>

#include <asm/io.h>
Expand Down Expand Up @@ -115,7 +116,7 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
struct mii_bus *bus;
struct resource res;
struct device_node *node;
int ret, i;
int ret;

node = of_get_parent(ofdev->node);
of_node_put(node);
Expand All @@ -130,17 +131,13 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
if (!bus)
return -ENOMEM;

bus->phy_mask = 0;
bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);

for (i = 0; i < PHY_MAX_ADDR; i++)
bus->irq[i] = -1;

bus->name = "ep8248e-mdio-bitbang";
bus->parent = &ofdev->dev;
snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);

return mdiobus_register(bus);
return of_mdiobus_register(bus, ofdev->node);
}

static int ep8248e_mdio_remove(struct of_device *ofdev)
Expand Down

0 comments on commit 8c6110e

Please sign in to comment.