summaryrefslogtreecommitdiffstats
path: root/drivers/net/bmac.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-06-02 17:09:18 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-06-02 17:50:38 +1000
commitc2cdf6aba0dfcfb54be646ab630c1bccd180e890 (patch)
tree97bfd319f0ebe514ef821a080b74860fb9dbaa24 /drivers/net/bmac.c
parent79905ad50bcf025deb81382413719ed600734941 (diff)
downloadop-kernel-dev-c2cdf6aba0dfcfb54be646ab630c1bccd180e890.zip
op-kernel-dev-c2cdf6aba0dfcfb54be646ab630c1bccd180e890.tar.gz
powerpc/macio: Fix probing of macio devices by using the right of match table
Grant patches added an of mach table to struct device_driver. However, while he changed the macio device code to use that, he left the match table pointer in struct macio_driver and didn't update drivers to use the "new" one, thus breaking the probing. This completes the change by moving all drivers to setup the "new" one, removing all traces of the old one, and while at it (since it changes the exact same locations), I also remove two other duplicates from struct driver which are the name and owner fields. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/net/bmac.c')
-rw-r--r--drivers/net/bmac.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 39250b2..959add2 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1654,8 +1654,11 @@ MODULE_DEVICE_TABLE (of, bmac_match);
static struct macio_driver bmac_driver =
{
- .name = "bmac",
- .match_table = bmac_match,
+ .driver = {
+ .name = "bmac",
+ .owner = THIS_MODULE,
+ .of_match_table = bmac_match,
+ },
.probe = bmac_probe,
.remove = bmac_remove,
#ifdef CONFIG_PM
OpenPOWER on IntegriCloud