From patchwork Fri Aug 14 14:11:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 7015321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 74D9B9F39D for ; Fri, 14 Aug 2015 14:14:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9E7AA207D2 for ; Fri, 14 Aug 2015 14:14:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CCC67207F2 for ; Fri, 14 Aug 2015 14:14:12 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZQFiX-00040m-B9; Fri, 14 Aug 2015 14:12:21 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZQFiH-0003mD-LE for linux-arm-kernel@lists.infradead.org; Fri, 14 Aug 2015 14:12:06 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ZQFhn-0005mP-RY; Fri, 14 Aug 2015 16:11:35 +0200 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.86) (envelope-from ) id 1ZQFhm-0000dj-35; Fri, 14 Aug 2015 16:11:34 +0200 From: Markus Pargmann To: Linus Walleij Subject: [PATCH v3 7/9] gpiolib-sysfs: Add gpio name parsing for sysfs export Date: Fri, 14 Aug 2015 16:11:04 +0200 Message-Id: <1439561466-14350-8-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1439561466-14350-1-git-send-email-mpa@pengutronix.de> References: <1439561466-14350-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150814_071205_902125_16E8FD04 X-CRM114-Status: GOOD ( 12.90 ) X-Spam-Score: -2.9 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Courbot , Arun Bharadwaj , Johan Hovold , linux-gpio@vger.kernel.org, kernel@pengutronix.de, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Markus Pargmann , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Markus Pargmann --- drivers/gpio/gpiolib-sysfs.c | 47 ++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c index 2022cfb00aeb..e401878d05ce 100644 --- a/drivers/gpio/gpiolib-sysfs.c +++ b/drivers/gpio/gpiolib-sysfs.c @@ -455,18 +455,28 @@ static ssize_t export_store(struct class *class, const char *buf, size_t len) { long gpio; - struct gpio_desc *desc; + struct gpio_desc *desc = NULL; int status; status = kstrtol(buf, 0, &gpio); - if (status < 0) - goto done; + if (!status) + desc = gpio_to_desc(gpio); - desc = gpio_to_desc(gpio); - /* reject invalid GPIOs */ + /* Fall back on detection by name */ if (!desc) { - pr_warn("%s: invalid GPIO %ld\n", __func__, gpio); - return -EINVAL; + char *gpio_name = kstrdup(buf, GFP_KERNEL); + + if (!gpio_name) + return -ENOMEM; + + desc = gpio_name_to_desc(strim(gpio_name)); + kfree(gpio_name); + + /* reject invalid GPIOs */ + if (!desc) { + pr_warn("%s: invalid GPIO %s\n", __func__, buf); + return -EINVAL; + } } /* No extra locking here; FLAG_SYSFS just signifies that the @@ -497,17 +507,28 @@ static ssize_t unexport_store(struct class *class, const char *buf, size_t len) { long gpio; - struct gpio_desc *desc; + struct gpio_desc *desc = NULL; int status; status = kstrtol(buf, 0, &gpio); - if (status < 0) - goto done; + if (!status) + desc = gpio_to_desc(gpio); + + /* Fall back on detection by name */ + if (!desc) { + char *gpio_name = kstrdup(buf, GFP_KERNEL); + + if (!gpio_name) + return -ENOMEM; + + desc = gpio_name_to_desc(strim(gpio_name)); + kfree(gpio_name); + } + - desc = gpio_to_desc(gpio); /* reject bogus commands (gpio_unexport ignores them) */ if (!desc) { - pr_warn("%s: invalid GPIO %ld\n", __func__, gpio); + pr_warn("%s: invalid GPIO %s\n", __func__, buf); return -EINVAL; } @@ -521,7 +542,7 @@ static ssize_t unexport_store(struct class *class, status = 0; gpiod_free(desc); } -done: + if (status) pr_debug("%s: status %d\n", __func__, status); return status ? : len;