From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 13 Jun 2023 09:45:54 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q8yix-004tFE-Qo for lore@lore.pengutronix.de; Tue, 13 Jun 2023 09:45:54 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q8yiv-0003T8-BC for lore@pengutronix.de; Tue, 13 Jun 2023 09:45:54 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=97e6BdpTvlahaNo8DBXANRMLkomKNbw5HbnBK+7d51E=; b=VyCUjo0a8yxDqA9zAjQ9l0S9rJ q78j25JWahj+02HGnws0gSvnNiLWkcZhPRU3QzadqsS527B/WxYN4iaG6s3RyPFD59UXWzN1Dvvbg rJqXXOigyulSzkbsHF3GcWaWNNgyEtYydZ9s21DCPZGiSLh35+erRSXUhek19KSEw1EGaFceVZNUi Ukwt5yxSb3IQEO23obxaC6g3qi1WEmuNL/VFCaTVWTkymd0HkPFZh0sbZLTpGkX9FJx6qda08pyF0 xVYsRwem+MYrq5hXoqnEGbyZfpT/I6C5dcgpZE8Eg4IVlSpwY7V/qmrPEOLwJ1UumtDFhtqfw5qRe 80OO6r5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q8yhw-007G19-2I; Tue, 13 Jun 2023 07:44:52 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q8yht-007G0L-1p for barebox@lists.infradead.org; Tue, 13 Jun 2023 07:44:51 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1q8yhs-00032H-2j; Tue, 13 Jun 2023 09:44:48 +0200 Message-ID: <215e513a-1919-f201-265d-f942e755a7a6@pengutronix.de> Date: Tue, 13 Jun 2023 09:44:47 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.2 Content-Language: en-US To: Marco Felsch , barebox@lists.infradead.org Cc: Jules Maselbas References: <20230602074921.2687669-1-m.felsch@pengutronix.de> <20230602074921.2687669-7-m.felsch@pengutronix.de> From: Ahmad Fatoum In-Reply-To: <20230602074921.2687669-7-m.felsch@pengutronix.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230613_004449_599407_213D17DF X-CRM114-Status: GOOD ( 30.72 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH 06/10] gpiolib: refactor gpio-line-names parsing X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On 02.06.23 09:49, Marco Felsch wrote: > Move the gpio-line-names parsing out of of_gpiochip_scan_hogs() since > this has nothing to do with gpio-hogs. The new function is very similar > with the kernel function devprop_gpiochip_set_names(). > > Signed-off-by: Marco Felsch Reviewed-by: Ahmad Fatoum > --- > drivers/gpio/gpiolib.c | 104 ++++++++++++++++++++++++++--------------- > 1 file changed, 66 insertions(+), 38 deletions(-) > > diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c > index 166356c85a..127cc60abd 100644 > --- a/drivers/gpio/gpiolib.c > +++ b/drivers/gpio/gpiolib.c > @@ -515,48 +515,11 @@ static int of_hog_gpio(struct device_node *np, struct gpio_chip *chip, > static int of_gpiochip_scan_hogs(struct gpio_chip *chip) > { > struct device_node *np; > - int ret, i, count; > + int ret, i; > > if (!IS_ENABLED(CONFIG_OFDEVICE) || !chip->dev->of_node) > return 0; > > - count = of_property_count_strings(chip->dev->of_node, > - "gpio-line-names"); > - > - if (count > 0) { > - const char **names = xzalloc(count * sizeof(char *)); > - > - ret = of_property_read_string_array(chip->dev->of_node, > - "gpio-line-names", names, > - count); > - if (ret < 0) { > - dev_warn(chip->dev, "failed to read GPIO line names\n"); > - kfree(names); > - return ret; > - } > - > - /* > - * Since property 'gpio-line-names' cannot contains gaps, we > - * have to be sure we only assign those pins that really exists > - * since chip->ngpio can be less. > - */ > - if (count > chip->ngpio) > - count = chip->ngpio; > - > - for (i = 0; i < count; i++) { > - /* > - * Allow overriding "fixed" names provided by the GPIO > - * provider. The "fixed" names are more often than not > - * generic and less informative than the names given in > - * device properties. > - */ > - if (names[i] && names[i][0]) > - gpio_desc[chip->base + i].name = names[i]; > - } > - > - free(names); > - } > - > for_each_available_child_of_node(chip->dev->of_node, np) { > if (!of_property_read_bool(np, "gpio-hog")) > continue; > @@ -576,6 +539,66 @@ static int of_gpiochip_scan_hogs(struct gpio_chip *chip) > return 0; > } > > +/* > + * of_gpiochip_set_names - Set GPIO line names using OF properties > + * @chip: GPIO chip whose lines should be named, if possible > + * > + * Looks for device property "gpio-line-names" and if it exists assigns > + * GPIO line names for the chip. The memory allocated for the assigned > + * names belong to the underlying firmware node and should not be released > + * by the caller. > + */ > +static int of_gpiochip_set_names(struct gpio_chip *chip) > +{ > + struct device *dev = chip->dev; > + struct device_node *np; > + const char **names; > + int ret, i, count; > + > + np = dev_of_node(dev); > + if (!np) > + return 0; > + > + count = of_property_count_strings(np, "gpio-line-names"); > + if (count < 0) > + return 0; > + > + names = kcalloc(count, sizeof(*names), GFP_KERNEL); > + if (!names) > + return -ENOMEM; > + > + ret = of_property_read_string_array(np, "gpio-line-names", > + names, count); > + if (ret < 0) { > + dev_warn(dev, "failed to read GPIO line names\n"); > + kfree(names); > + return ret; > + } > + > + /* > + * Since property 'gpio-line-names' cannot contains gaps, we > + * have to be sure we only assign those pins that really exists > + * since chip->ngpio can be less. > + */ > + if (count > chip->ngpio) > + count = chip->ngpio; > + > + for (i = 0; i < count; i++) { > + /* > + * Allow overriding "fixed" names provided by the GPIO > + * provider. The "fixed" names are more often than not > + * generic and less informative than the names given in > + * device properties. > + */ > + if (names[i] && names[i][0]) > + gpio_desc[chip->base + i].name = names[i]; > + } > + > + free(names); > + > + return 0; > +} > + > #ifdef CONFIG_OFDEVICE > static const char *gpio_suffixes[] = { > "gpios", > @@ -637,6 +660,7 @@ int dev_gpiod_get_index(struct device *dev, > > int gpiochip_add(struct gpio_chip *chip) > { > + int ret; > int i; > > if (chip->base >= 0) { > @@ -656,6 +680,10 @@ int gpiochip_add(struct gpio_chip *chip) > for (i = chip->base; i < chip->base + chip->ngpio; i++) > gpio_desc[i].chip = chip; > > + ret = of_gpiochip_set_names(chip); > + if (ret) > + return ret; > + > return of_gpiochip_scan_hogs(chip); > } > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |