summaryrefslogtreecommitdiff
path: root/sound/aoa/soundbus
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 /sound/aoa/soundbus
parent79905ad50bcf025deb81382413719ed600734941 (diff)
downloadlinux-3.10-c2cdf6aba0dfcfb54be646ab630c1bccd180e890.tar.gz
linux-3.10-c2cdf6aba0dfcfb54be646ab630c1bccd180e890.tar.bz2
linux-3.10-c2cdf6aba0dfcfb54be646ab630c1bccd180e890.zip
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 'sound/aoa/soundbus')
-rw-r--r--sound/aoa/soundbus/i2sbus/core.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c
index 67893372173..3ff8cc5f487 100644
--- a/sound/aoa/soundbus/i2sbus/core.c
+++ b/sound/aoa/soundbus/i2sbus/core.c
@@ -437,9 +437,11 @@ static int i2sbus_shutdown(struct macio_dev* dev)
}
static struct macio_driver i2sbus_drv = {
- .name = "soundbus-i2s",
- .owner = THIS_MODULE,
- .match_table = i2sbus_match,
+ .driver = {
+ .name = "soundbus-i2s",
+ .owner = THIS_MODULE,
+ .of_match_table = i2sbus_match,
+ },
.probe = i2sbus_probe,
.remove = i2sbus_remove,
#ifdef CONFIG_PM