From: Uwe Kleine-König Date: Mon, 13 Mar 2023 18:08:48 +0000 (+0100) Subject: nubus: Drop noop match function X-Git-Tag: v6.4-rc1~184^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f400a1dc29f3ed6cb0fe0e58f706b6933f72625;p=thirdparty%2Flinux.git nubus: Drop noop match function nubus_bus_match() returned 1 unconditionally. This is equivalent to no match function at all. (See driver_match_device() which does: return drv->bus->match ? drv->bus->match(dev, drv) : 1; .) Signed-off-by: Uwe Kleine-König Acked-by: Finn Thain Reviewed-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/20230313180848.2770504-1-u.kleine-koenig@pengutronix.de Signed-off-by: Geert Uytterhoeven --- diff --git a/drivers/nubus/bus.c b/drivers/nubus/bus.c index 17fad660032c8..72921e4f35f6e 100644 --- a/drivers/nubus/bus.c +++ b/drivers/nubus/bus.c @@ -14,11 +14,6 @@ #define to_nubus_board(d) container_of(d, struct nubus_board, dev) #define to_nubus_driver(d) container_of(d, struct nubus_driver, driver) -static int nubus_bus_match(struct device *dev, struct device_driver *driver) -{ - return 1; -} - static int nubus_device_probe(struct device *dev) { struct nubus_driver *ndrv = to_nubus_driver(dev->driver); @@ -39,7 +34,6 @@ static void nubus_device_remove(struct device *dev) struct bus_type nubus_bus_type = { .name = "nubus", - .match = nubus_bus_match, .probe = nubus_device_probe, .remove = nubus_device_remove, };