Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cda08a2 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

drivers: Introduce device lookup variants by name 



Add a helper to match the device name for device lookup. Also
reuse this generic exported helper for the existing bus_find_device_by_name().
and add similar variants for driver/class.

Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexander Aring <alex.aring@gmail.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dan Murphy <dmurphy@ti.com>
Cc: Harald Freudenberger <freude@linux.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: linux-leds@vger.kernel.org
Cc: linux-rtc@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Cc: linux-wpan@vger.kernel.org
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Peter Oberparleiter <oberpar@linux.ibm.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Stefan Schmidt <stefan@datenfreihafen.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20190723221838.12024-2-suzuki.poulose@arm.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f9e832c

drivers/base/bus.c

+0 −24
Original line number Diff line number Diff line
@@ -342,30 +342,6 @@ struct device *bus_find_device(struct bus_type *bus, 
}

EXPORT_SYMBOL_GPL(bus_find_device);



static int match_name(struct device *dev, const void *data)

{

	const char *name = data;



	return sysfs_streq(name, dev_name(dev));

}



/**

 * bus_find_device_by_name - device iterator for locating a particular device of a specific name

 * @bus: bus type

 * @start: Device to begin with

 * @name: name of the device to match

 *

 * This is similar to the bus_find_device() function above, but it handles

 * searching by a name automatically, no need to write another strcmp matching

 * function.

 */

struct device *bus_find_device_by_name(struct bus_type *bus,

				       struct device *start, const char *name)

{

	return bus_find_device(bus, start, (void *)name, match_name);

}

EXPORT_SYMBOL_GPL(bus_find_device_by_name);



/**

 * subsys_find_device_by_id - find a device with a specific enumeration number

 * @subsys: subsystem

drivers/base/core.c

+6 −0
Original line number Diff line number Diff line
@@ -3357,6 +3357,12 @@ void device_set_of_node_from_dev(struct device *dev, const struct device *dev2) 
}

EXPORT_SYMBOL_GPL(device_set_of_node_from_dev);



int device_match_name(struct device *dev, const void *name)

{

	return sysfs_streq(dev_name(dev), name);

}

EXPORT_SYMBOL_GPL(device_match_name);



int device_match_of_node(struct device *dev, const void *np)

{

	return dev->of_node == np;

drivers/hwtracing/stm/core.c

+1 −8
Original line number Diff line number Diff line
@@ -89,13 +89,6 @@ static struct class stm_class = { 
	.dev_groups	= stm_groups,

};



static int stm_dev_match(struct device *dev, const void *data)

{

	const char *name = data;



	return sysfs_streq(name, dev_name(dev));

}



/**

 * stm_find_device() - find stm device by name

 * @buf:	character buffer containing the name
@@ -116,7 +109,7 @@ struct stm_device *stm_find_device(const char *buf) 
	if (!stm_core_up)

		return NULL;



	dev = class_find_device(&stm_class, NULL, buf, stm_dev_match);

	dev = class_find_device_by_name(&stm_class, buf);

	if (!dev)

		return NULL;

drivers/leds/led-class.c

+1 −8
Original line number Diff line number Diff line
@@ -213,13 +213,6 @@ static int led_resume(struct device *dev) 


static SIMPLE_DEV_PM_OPS(leds_class_dev_pm_ops, led_suspend, led_resume);



static int match_name(struct device *dev, const void *data)

{

	if (!dev_name(dev))

		return 0;

	return !strcmp(dev_name(dev), (char *)data);

}



static int led_classdev_next_name(const char *init_name, char *name,

				  size_t len)

{
@@ -230,7 +223,7 @@ static int led_classdev_next_name(const char *init_name, char *name, 
	strlcpy(name, init_name, len);



	while ((ret < len) &&

	       (dev = class_find_device(leds_class, NULL, name, match_name))) {

	       (dev = class_find_device_by_name(leds_class, name))) {

		put_device(dev);

		ret = snprintf(name, len, "%s_%u", init_name, ++i);

	}

drivers/rtc/interface.c

+1 −10
Original line number Diff line number Diff line
@@ -663,21 +663,12 @@ void rtc_update_irq(struct rtc_device *rtc, 
}

EXPORT_SYMBOL_GPL(rtc_update_irq);



static int __rtc_match(struct device *dev, const void *data)

{

	const char *name = data;



	if (strcmp(dev_name(dev), name) == 0)

		return 1;

	return 0;

}



struct rtc_device *rtc_class_open(const char *name)

{

	struct device *dev;

	struct rtc_device *rtc = NULL;



	dev = class_find_device(rtc_class, NULL, name, __rtc_match);

	dev = class_find_device_by_name(rtc_class, name);

	if (dev)

		rtc = to_rtc_device(dev);