From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751925AbdAYPfG (ORCPT ); Wed, 25 Jan 2017 10:35:06 -0500 Received: from mail-wm0-f42.google.com ([74.125.82.42]:35253 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751819AbdAYPel (ORCPT ); Wed, 25 Jan 2017 10:34:41 -0500 From: Bartosz Golaszewski To: Linus Walleij , Alexandre Courbot , Bamvor Jian Zhang Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 6/7] gpio: mockup: implement naming the GPIO lines Date: Wed, 25 Jan 2017 16:34:20 +0100 Message-Id: <1485358461-24070-7-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1485358461-24070-1-git-send-email-bgolaszewski@baylibre.com> References: <1485358461-24070-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement a new boolean module argument that indicates that the mockup lines should be named. The names are created by appending the line offset to the chip label. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-mockup.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c index c5eb530..dabf3ec 100644 --- a/drivers/gpio/gpio-mockup.c +++ b/drivers/gpio/gpio-mockup.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "gpiolib.h" @@ -48,6 +49,10 @@ static int gpio_mockup_ranges[MAX_GC << 1]; static int gpio_mockup_params_nr; module_param_array(gpio_mockup_ranges, int, &gpio_mockup_params_nr, 0400); +static bool gpio_mockup_named_lines; +module_param_named(gpio_mockup_named_lines, + gpio_mockup_named_lines, bool, 0400); + static const char pins_name_start = 'A'; static struct dentry *dbg_dir; @@ -169,7 +174,8 @@ static int mockup_gpio_add(struct device *dev, struct mockup_gpio_controller *cntr, const char *name, int base, int ngpio) { - int ret; + char **names; + int ret, i; cntr->gc.base = base; cntr->gc.ngpio = ngpio; @@ -188,6 +194,28 @@ static int mockup_gpio_add(struct device *dev, ret = -ENOMEM; goto err; } + + if (gpio_mockup_named_lines) { + names = devm_kzalloc(dev, + sizeof(char *) * cntr->gc.ngpio, + GFP_KERNEL); + if (!names) { + ret = -ENOMEM; + goto err; + } + + for (i = 0; i < cntr->gc.ngpio; i++) { + names[i] = devm_kasprintf(dev, GFP_KERNEL, + "%s-%d", cntr->gc.label, i); + if (!names[i]) { + ret = -ENOMEM; + goto err; + } + } + + cntr->gc.names = (const char *const*)names; + } + ret = devm_gpiochip_add_data(dev, &cntr->gc, cntr); if (ret) goto err; -- 2.9.3