ieee1394: prevent device binding of raw1394, video1394, dv1394

These drivers don't need to match any unit_directory type device.
They just need the id_table for module autoloading per module alias.

Not binding any of these drivers allows special-purpose drivers with
similar or same IDs to bind to devices.  This currently only benefits
out-of-tree drivers; on the other hand it is in no way detrimental to
in-tree drivers.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 65722117ab6e449b7cf2445a286d1e63131fcb4f..8c72f360f2d54742993f81184c0fbe3e3f8279c2 100644 (file)
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -2179,8 +2179,7 @@ static struct ieee1394_device_id dv1394_id_table[] = {
 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
 
 static struct hpsb_protocol_driver dv1394_driver = {
-       .name           = "dv1394",
-       .id_table       = dv1394_id_table,
+       .name = "dv1394",
 };
 
 

diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 511e4321c6b6220916a37b05c81d490bce9f4a47..70afa3786f3f7d549f91d9c8317b0bd0ff105931 100644 (file)
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -701,7 +701,11 @@ static int nodemgr_bus_match(struct device * dev, struct device_driver * drv)
                return 0;
 
        driver = container_of(drv, struct hpsb_protocol_driver, driver);
-       for (id = driver->id_table; id->match_flags != 0; id++) {
+       id = driver->id_table;
+       if (!id)
+               return 0;
+
+       for (; id->match_flags != 0; id++) {
                if ((id->match_flags & IEEE1394_MATCH_VENDOR_ID) &&
                    id->vendor_id != ud->vendor_id)
                        continue;

diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 37e7e109af38258c5a2bb44c6a4469481917f34a..3634785d3b4bbacbb31813b399a1dc1e8fefd958 100644 (file)
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -2959,7 +2959,6 @@ MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
 
 static struct hpsb_protocol_driver raw1394_driver = {
        .name = "raw1394",
-       .id_table = raw1394_id_table,
 };
 
 /******************************************************************************/

diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index bd28adfd7afc6742e7859ced1fffcd374a8a8717..cc240b2e72d97f8af92fe6121b8f9c112831c30e 100644 (file)
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -1315,8 +1315,7 @@ static struct ieee1394_device_id video1394_id_table[] = {
 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
 
 static struct hpsb_protocol_driver video1394_driver = {
-       .name           = VIDEO1394_DRIVER_NAME,
-       .id_table       = video1394_id_table,
+       .name = VIDEO1394_DRIVER_NAME,
 };