diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-06-02 17:09:18 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-06-02 17:50:38 +1000 |
| commit | c2cdf6aba0dfcfb54be646ab630c1bccd180e890 (patch) | |
| tree | 97bfd319f0ebe514ef821a080b74860fb9dbaa24 /drivers/scsi | |
| parent | 79905ad50bcf025deb81382413719ed600734941 (diff) | |
| download | linux-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 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/mac53c94.c | 7 | ||||
| -rw-r--r-- | drivers/scsi/mesh.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c index 18735b39b3d..3ddb4dc62d5 100644 --- a/drivers/scsi/mac53c94.c +++ b/drivers/scsi/mac53c94.c @@ -542,8 +542,11 @@ MODULE_DEVICE_TABLE (of, mac53c94_match); static struct macio_driver mac53c94_driver = { - .name = "mac53c94", - .match_table = mac53c94_match, + .driver = { + .name = "mac53c94", + .owner = THIS_MODULE, + .of_match_table = mac53c94_match, + }, .probe = mac53c94_probe, .remove = mac53c94_remove, }; diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index a1c97e88068..1f784fde251 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c @@ -2036,8 +2036,11 @@ MODULE_DEVICE_TABLE (of, mesh_match); static struct macio_driver mesh_driver = { - .name = "mesh", - .match_table = mesh_match, + .driver = { + .name = "mesh", + .owner = THIS_MODULE, + .of_match_table = mesh_match, + }, .probe = mesh_probe, .remove = mesh_remove, .shutdown = mesh_shutdown, |