From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751695AbdLAQ6g (ORCPT ); Fri, 1 Dec 2017 11:58:36 -0500 Received: from lelnx193.ext.ti.com ([198.47.27.77]:22896 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750975AbdLAQ6f (ORCPT ); Fri, 1 Dec 2017 11:58:35 -0500 Subject: Re: [PATCH v6 6/6] leds: as3645a: Update the LED label generation To: , , CC: , References: <20171201165613.10358-1-dmurphy@ti.com> <20171201165613.10358-6-dmurphy@ti.com> From: Dan Murphy Message-ID: Date: Fri, 1 Dec 2017 10:58:19 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20171201165613.10358-6-dmurphy@ti.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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/01/2017 10:56 AM, Dan Murphy wrote: > Update the LED label creationg to call the s/creationg/creation > of_led_compose_name api to generate a label. > > Signed-off-by: Dan Murphy > --- > > v6 - New patch to use the new LED class API > > drivers/leds/leds-as3645a.c | 24 +++++++++--------------- > 1 file changed, 9 insertions(+), 15 deletions(-) > > diff --git a/drivers/leds/leds-as3645a.c b/drivers/leds/leds-as3645a.c > index 9a257f969300..5a29db115277 100644 > --- a/drivers/leds/leds-as3645a.c > +++ b/drivers/leds/leds-as3645a.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > > #include > > @@ -133,8 +134,8 @@ struct as3645a_config { > }; > > struct as3645a_names { > - char flash[32]; > - char indicator[32]; > + char flash[LED_MAX_NAME_SIZE]; > + char indicator[LED_MAX_NAME_SIZE]; > }; > > struct as3645a { > @@ -496,7 +497,6 @@ static int as3645a_parse_node(struct as3645a *flash, > { > struct as3645a_config *cfg = &flash->cfg; > struct device_node *child; > - const char *name; > int rval; > > for_each_child_of_node(node, child) { > @@ -523,12 +523,9 @@ static int as3645a_parse_node(struct as3645a *flash, > return -ENODEV; > } > > - rval = of_property_read_string(flash->flash_node, "label", &name); > - if (!rval) > - strlcpy(names->flash, name, sizeof(names->flash)); > - else > - snprintf(names->flash, sizeof(names->flash), > - "%s:flash", node->name); > + of_led_compose_name(node, flash->flash_node, "flash", > + sizeof("flash"), > + names->flash); > > rval = of_property_read_u32(flash->flash_node, "flash-timeout-us", > &cfg->flash_timeout_us); > @@ -567,12 +564,9 @@ static int as3645a_parse_node(struct as3645a *flash, > goto out_err; > } > > - rval = of_property_read_string(flash->indicator_node, "label", &name); > - if (!rval) > - strlcpy(names->indicator, name, sizeof(names->indicator)); > - else > - snprintf(names->indicator, sizeof(names->indicator), > - "%s:indicator", node->name); > + of_led_compose_name(node, flash->indicator_node, "indicator", > + sizeof("indicator"), > + names->indicator); > > rval = of_property_read_u32(flash->indicator_node, "led-max-microamp", > &cfg->indicator_max_ua); > -- ------------------ Dan Murphy