From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4C3BECDE4B for ; Thu, 8 Nov 2018 18:14:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A469020825 for ; Thu, 8 Nov 2018 18:14:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A469020825 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=ti.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727334AbeKIDvW (ORCPT ); Thu, 8 Nov 2018 22:51:22 -0500 Received: from fllv0015.ext.ti.com ([198.47.19.141]:37418 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726781AbeKIDvV (ORCPT ); Thu, 8 Nov 2018 22:51:21 -0500 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id wA8IEZbw009785; Thu, 8 Nov 2018 12:14:35 -0600 Received: from DLEE100.ent.ti.com (dlee100.ent.ti.com [157.170.170.30]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id wA8IEZlO124704 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 8 Nov 2018 12:14:35 -0600 Received: from DLEE115.ent.ti.com (157.170.170.26) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Thu, 8 Nov 2018 12:14:34 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Thu, 8 Nov 2018 12:14:34 -0600 Received: from [172.22.151.38] (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id wA8IEYQn019624; Thu, 8 Nov 2018 12:14:34 -0600 Subject: Re: [PATCH 12/24] leds: lm3692x: Use led_compose_name() To: Jacek Anaszewski , CC: , , , References: <1541542052-10081-1-git-send-email-jacek.anaszewski@gmail.com> <1541542052-10081-13-git-send-email-jacek.anaszewski@gmail.com> From: Dan Murphy Message-ID: Date: Thu, 8 Nov 2018 12:14:34 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <1541542052-10081-13-git-send-email-jacek.anaszewski@gmail.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/06/2018 04:07 PM, Jacek Anaszewski wrote: > Switch to using generic LED support for composing LED class > device name. > > Signed-off-by: Jacek Anaszewski > Cc: Dan Murphy > --- > drivers/leds/leds-lm3692x.c | 39 ++++++++++++++++++++------------------- > 1 file changed, 20 insertions(+), 19 deletions(-) > > diff --git a/drivers/leds/leds-lm3692x.c b/drivers/leds/leds-lm3692x.c > index 4f413a7..9dfc0f2 100644 > --- a/drivers/leds/leds-lm3692x.c > +++ b/drivers/leds/leds-lm3692x.c > @@ -13,7 +13,6 @@ > #include > #include > #include > -#include > > #define LM36922_MODEL 0 > #define LM36923_MODEL 1 > @@ -95,6 +94,9 @@ > #define LM3692X_FAULT_FLAG_SHRT BIT(3) > #define LM3692X_FAULT_FLAG_OPEN BIT(4) > > +#define LM36922_NAME "lm36922" > +#define LM36923_NAME "lm36923" > + > /** > * struct lm3692x_led - > * @lock - Lock for reading/writing the device > @@ -103,7 +105,6 @@ > * @regmap - Devices register map > * @enable_gpio - VDDIO/EN gpio to enable communication interface > * @regulator - LED supply regulator pointer > - * @label - LED label > * @led_enable - LED sync to be enabled > * @model_id - Current device model ID enumerated > */ > @@ -114,7 +115,6 @@ struct lm3692x_led { > struct regmap *regmap; > struct gpio_desc *enable_gpio; > struct regulator *regulator; > - char label[LED_MAX_NAME_SIZE]; > int led_enable; > int model_id; > }; > @@ -325,7 +325,8 @@ static int lm3692x_init(struct lm3692x_led *led) > static int lm3692x_probe_dt(struct lm3692x_led *led) > { > struct fwnode_handle *child = NULL; > - const char *name; > + struct led_init_data init_data; > + char *model_name; > int ret; > > led->enable_gpio = devm_gpiod_get_optional(&led->client->dev, > @@ -346,17 +347,20 @@ static int lm3692x_probe_dt(struct lm3692x_led *led) > dev_err(&led->client->dev, "No LED Child node\n"); > return -ENODEV; > } > + init_data.fwnode = child; > > - fwnode_property_read_string(child, "linux,default-trigger", > - &led->led_dev.default_trigger); > + if (led->model_id == LM36922_MODEL) > + model_name = LM36922_NAME; > + else > + model_name = LM36923_NAME; > > - ret = fwnode_property_read_string(child, "label", &name); > + ret = led_compose_name(child, model_name, ":backlight_cluster", > + init_data.name); > if (ret) > - snprintf(led->label, sizeof(led->label), > - "%s::", led->client->name); > - else > - snprintf(led->label, sizeof(led->label), > - "%s:%s", led->client->name, name); > + return ret; > + > + fwnode_property_read_string(child, "linux,default-trigger", > + &led->led_dev.default_trigger); > > ret = fwnode_property_read_u32(child, "reg", &led->led_enable); > if (ret) { > @@ -364,16 +368,13 @@ static int lm3692x_probe_dt(struct lm3692x_led *led) > return ret; > } > > - led->led_dev.name = led->label; > - > - ret = devm_led_classdev_register(&led->client->dev, &led->led_dev); > + ret = devm_led_classdev_register_ext(&led->client->dev, &led->led_dev, > + &init_data); > if (ret) { > dev_err(&led->client->dev, "led register err: %d\n", ret); > return ret; > } > > - led->led_dev.dev->of_node = to_of_node(child); > - > return 0; > } > > @@ -439,8 +440,8 @@ static int lm3692x_remove(struct i2c_client *client) > } > > static const struct i2c_device_id lm3692x_id[] = { > - { "lm36922", LM36922_MODEL }, > - { "lm36923", LM36923_MODEL }, > + { LM36922_NAME, LM36922_MODEL }, > + { LM36923_NAME, LM36923_MODEL }, How is this change relevant? No mention in the comments about this change. Dan > { } > }; > MODULE_DEVICE_TABLE(i2c, lm3692x_id); > -- ------------------ Dan Murphy