From patchwork Tue Jan 16 07:42:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 124611 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp926844lje; Mon, 15 Jan 2018 23:44:22 -0800 (PST) X-Google-Smtp-Source: ACJfBovtNSxvigY46grc7a2RZtP/VK9r0vOtwROBjyehyOa0Y1oJE6kMBdq+2NrF5YoyEcM/mFW7 X-Received: by 10.159.242.196 with SMTP id x4mr29978196plw.408.1516088661975; Mon, 15 Jan 2018 23:44:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516088661; cv=none; d=google.com; s=arc-20160816; b=yVE3HhtwGOOGzyIncWUQ1XE/YKb8bAbakEW6m7Wbau1QXQiC5r5NUQ2Qy/7hRTsN7I SZDw5dQTglxyHmYvBH+2hc9hjA12bxJ6DiswdwA/8KbIpncSWi6mD/6XR0rZvrV7N/vD s9vEF380C7YMjbdSS+YWVWYFTIsI+zdz3aUonIXEYZ9QzYA0G8zI2iuGhAVmGWxMiiyI +gqp8A2aEQz6+56A4OpobqYMzA6YnVct3bOBpvv0AX7oXY/xceSLnTih/ETlm3kZ7As/ z491pdNH6KNXLcVh/GYI3svT2BVSxJWrPo3I41dpvQJQztQXSH77/K4aH8GxhVqehc8f Oolw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=09XfNt5jwkc0GMxWCOlhR8RIXv0j/srf8b/ZIr7pbWE=; b=w+jfaHIBbjp7O+vyvxz42DXZc4aEB0vIvp8a54sbSNMFLDe8JLykFxbrJOKIA5ezSf MGPwxjRUW5c87FemPPyO5F7pE4Xjx8KRTi0PpCv0rWpzsF1fUReK3sv7r1Uy+wOpR3QS f1LEU6aWrnAdSjnyWJUXMJr/JDcw1JRR4qaevU7ubZTa9ilxRhPUiMPLc9LYz8Kfa3iE kKsg+ykJicCb5LE0uaVw72gi3wPpmJF0cIpAjRiTpM4RtyLftqPRwiQEJqJBjBxBkL4X 7tReXttXPCSfkAR8U9v5n/6pMorBEiharizrXy7Mah0W4hToUgk5ywI/mMPAu+oRA2WQ PhKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LRAW6tDt; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e2si1272048pff.231.2018.01.15.23.44.21; Mon, 15 Jan 2018 23:44:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LRAW6tDt; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750740AbeAPHoV (ORCPT + 6 others); Tue, 16 Jan 2018 02:44:21 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:43166 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750738AbeAPHoU (ORCPT ); Tue, 16 Jan 2018 02:44:20 -0500 Received: by mail-lf0-f66.google.com with SMTP id o89so12068613lfg.10 for ; Mon, 15 Jan 2018 23:44:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=2yBrvXAEmjgl9pEuQC4t7HoxAACL0PHVYNDYQ3J04w0=; b=LRAW6tDt9yStlo7JpZ6n3EOHN8biWvEfLcas4nZeGKQ97pRGcrhKOogqrfnQyqyOwM Lh4PYlfHvjR2tSYQLlF5veqHH4ET3SK4dJqV4qufZFCVSdn3VcHYp1G782+9r0lhBkpp lHLrdX+yTTRWhx1NHtCSbiLyUU4SiK711XJ9k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2yBrvXAEmjgl9pEuQC4t7HoxAACL0PHVYNDYQ3J04w0=; b=idn5onRf5ghqExRYuvXXN4dZ2r7nfK9xI46BTopynh+0SSXWY1/ORGCsWqRA5mogST pBCLbW/3SzPPjlRvW16Ht/jGPk3ccKiHbYxPIOcNRKFye9tNLWnCKlBWvFTLWKKcJR6I wNzhORVSo9ldTc6YLAtCRGWTElF0uoyh+U6AtRPLKvJM+BbH1A6O6sridjrhsmslKvg6 aNxxrd0C6WBl8q1dPb/4jDIWTGd2mwQI+5a2FbMTXHrVYUQNm4QqXcLMa3I5ae8AFvOR YTNysBdQxeVHd6VKEoxD0loBtpBI1iUs7rbrddGgRhZ3E30OPROccicDEcf3vpA8PlP7 nByg== X-Gm-Message-State: AKwxyteW/mGWw06WImdYLsp33Oi5QcP4VdZhOsb9tuGPRPFFq4xlNW3t sHzYjn1BAij49tN37mT2gfdSe+xQKkE= X-Received: by 10.25.77.212 with SMTP id a203mr10598433lfb.14.1516088659221; Mon, 15 Jan 2018 23:44:19 -0800 (PST) Received: from localhost.localdomain (c-cb7471d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.116.203]) by smtp.gmail.com with ESMTPSA id 84sm253958lfs.21.2018.01.15.23.44.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Jan 2018 23:44:18 -0800 (PST) From: Linus Walleij To: linux-gpio@vger.kernel.org Cc: Linus Walleij Subject: [PATCH] gpio: No NULL owner Date: Tue, 16 Jan 2018 08:42:12 +0100 Message-Id: <20180116074212.4022-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.14.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Sometimes a GPIO is fetched with NULL as parent device, and that is just fine. So under these circumstances, avoid using dev_name() to provide a name for the GPIO line. Signed-off-by: Linus Walleij --- drivers/gpio/gpiolib.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.14.3 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index bf083bc58d30..4092b8601c4e 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -3623,6 +3623,8 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev, struct gpio_desc *desc = NULL; int status; enum gpio_lookup_flags lookupflags = 0; + /* Maybe we have a device name, maybe not */ + const char *devname = dev ? dev_name(dev) : "?"; dev_dbg(dev, "GPIO lookup for consumer %s\n", con_id); @@ -3651,8 +3653,11 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev, return desc; } - /* If a connection label was passed use that, else use the device name as label */ - status = gpiod_request(desc, con_id ? con_id : dev_name(dev)); + /* + * If a connection label was passed use that, else attempt to use + * the device name as label + */ + status = gpiod_request(desc, con_id ? con_id : devname); if (status < 0) return ERR_PTR(status);