Use the new class_find_device_by_name() helper. Cc: Jacek Anaszewski <jacek.anaszewski@xxxxxxxxx> Cc: Pavel Machek <pavel@xxxxxx> Cc: Dan Murphy <dmurphy@xxxxxx> Cc: linux-leds@xxxxxxxxxxxxxxx Signed-off-by: Suzuki K Poulose <suzuki.poulose@xxxxxxx> --- drivers/leds/led-class.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index 85848c5..ee052aa 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -216,13 +216,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) { @@ -233,7 +226,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, NULL, name))) { put_device(dev); ret = snprintf(name, len, "%s_%u", init_name, ++i); } -- 2.7.4