diff options
Diffstat (limited to 'drivers/zorro/zorro-driver.c')
| -rw-r--r-- | drivers/zorro/zorro-driver.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c index fa23b7366b98..0dd7cbcec2b0 100644 --- a/drivers/zorro/zorro-driver.c +++ b/drivers/zorro/zorro-driver.c @@ -28,7 +28,7 @@ * zorro_device_id structure or %NULL if there is no match. */ -const struct zorro_device_id * +static const struct zorro_device_id * zorro_match_device(const struct zorro_device_id *ids, const struct zorro_dev *z) { @@ -39,7 +39,6 @@ zorro_match_device(const struct zorro_device_id *ids, } return NULL; } -EXPORT_SYMBOL(zorro_match_device); static int zorro_device_probe(struct device *dev) @@ -120,9 +119,9 @@ EXPORT_SYMBOL(zorro_unregister_driver); * @ids: array of Zorro device id structures to search in * @dev: the Zorro device structure to match against * - * Used by a driver to check whether a Zorro device present in the - * system is in its list of supported devices.Returns the matching - * zorro_device_id structure or %NULL if there is no match. + * Used by the driver core to check whether a Zorro device present in the + * system is in a driver's list of supported devices. Returns 1 if + * supported, and 0 if there is no match. */ static int zorro_bus_match(struct device *dev, struct device_driver *drv) @@ -134,12 +133,7 @@ static int zorro_bus_match(struct device *dev, struct device_driver *drv) if (!ids) return 0; - while (ids->id) { - if (ids->id == ZORRO_WILDCARD || ids->id == z->id) - return 1; - ids++; - } - return 0; + return !!zorro_match_device(ids, z); } static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env) |