diff mbox series

[15/21] driver core: bus: clean up driver_find()

Message ID	20230208111330.439504-16-gregkh@linuxfoundation.org
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Rafael J. Wysocki" <rafael@kernel.org> Subject: [PATCH 15/21] driver core: bus: clean up driver_find() Date: Wed, 8 Feb 2023 12:13:24 +0100 Message-Id: <20230208111330.439504-16-gregkh@linuxfoundation.org> In-Reply-To: <20230208111330.439504-1-gregkh@linuxfoundation.org> References: <20230208111330.439504-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	driver core: bus: remove private "backpointer" from struct bus_type \| [00/21] driver core: bus: remove private "backpointer" from struct bus_type [01/21] driver core: add local subsys_get and subsys_put functions [02/21] driver core: bus: implement bus_get/put() without the private pointer [03/21] driver core: bus: constantify the bus_find_* functions [04/21] driver core: bus: convert bus_create/remove_file to be constant [05/21] driver core: bus: sysfs function cleanups [06/21] driver core: bus: bus_add/probe/remove_device() cleanups [07/21] driver core: bus: bus_register/unregister() cleanups [08/21] driver core: bus: subsys_interface_register/unregister() cleanups [09/21] driver core: bus: bus_get_kset() cleanup [10/21] driver core: bus: bus_register/unregister_notifier() cleanups [11/21] driver core: bus: bus_add/remove_driver() cleanups [12/21] driver core: bus: bus iterator cleanups [13/21] driver core: bus: clean up bus_sort_breadthfirst() [14/21] driver core: move driver_find() to bus.c [15/21] driver core: bus: clean up driver_find() [16/21] driver core: create bus_is_registered() [17/21] driver core: remove private pointer from struct bus_type [18/21] driver core: bus: constify bus_register/unregister_notifier() [19/21] driver core: bus: constify bus_get_kset() [20/21] driver core: bus: constify some internal functions [21/21] driver core: bus: constify bus_unregister()

Commit Message

Greg KH Feb. 8, 2023, 11:13 a.m. UTC

  Convert the driver_find() function to use bus_to_subsys() and not use
the back-pointer to the private structure.

Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/base/bus.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff mbox series

Patch

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 727de4c36d59..951d63c8e885 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -1302,16 +1302,23 @@  EXPORT_SYMBOL_GPL(subsys_virtual_register);
  */
 struct device_driver *driver_find(const char *name, struct bus_type *bus)
 {
-	struct kobject *k = kset_find_obj(bus->p->drivers_kset, name);
+	struct subsys_private *sp = bus_to_subsys(bus);
+	struct kobject *k;
 	struct driver_private *priv;
 
-	if (k) {
-		/* Drop reference added by kset_find_obj() */
-		kobject_put(k);
-		priv = to_driver(k);
-		return priv->driver;
-	}
-	return NULL;
+	if (!sp)
+		return NULL;
+
+	k = kset_find_obj(sp->drivers_kset, name);
+	subsys_put(sp);
+	if (!k)
+		return NULL;
+
+	priv = to_driver(k);
+
+	/* Drop reference added by kset_find_obj() */
+	kobject_put(k);
+	return priv->driver;
 }
 EXPORT_SYMBOL_GPL(driver_find);