diff options
Diffstat (limited to 'drivers/zorro')
| -rw-r--r-- | drivers/zorro/zorro-driver.c | 16 | ||||
| -rw-r--r-- | drivers/zorro/zorro.c | 2 | ||||
| -rw-r--r-- | drivers/zorro/zorro.h | 7 |
3 files changed, 13 insertions, 12 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) diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c index 8eeb84c239db..47c733817903 100644 --- a/drivers/zorro/zorro.c +++ b/drivers/zorro/zorro.c @@ -41,7 +41,7 @@ struct zorro_dev *zorro_autocon; struct zorro_bus { struct device dev; - struct zorro_dev devices[0]; + struct zorro_dev devices[]; }; diff --git a/drivers/zorro/zorro.h b/drivers/zorro/zorro.h index ac0bab3412d9..f84df9fb4c20 100644 --- a/drivers/zorro/zorro.h +++ b/drivers/zorro/zorro.h @@ -1,5 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0 */ + /* + * Zorro bus + */ + +extern struct bus_type zorro_bus_type; + + #ifdef CONFIG_ZORRO_NAMES extern void zorro_name_device(struct zorro_dev *z); #else |