From patchwork Fri Nov 11 22:19:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 19033 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp994107wru; Fri, 11 Nov 2022 14:21:10 -0800 (PST) X-Google-Smtp-Source: AA0mqf4lFMMffbhnlZlylGwIIjvdKEKK+uPhyXCA0VQnMsazZ1dBC1+81QqzWh3pICyq4NMFlua9 X-Received: by 2002:a17:902:e3d2:b0:188:5c52:83e1 with SMTP id r18-20020a170902e3d200b001885c5283e1mr4295168ple.128.1668205269807; Fri, 11 Nov 2022 14:21:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668205269; cv=none; d=google.com; s=arc-20160816; b=R5QibVaOAsdt0o/o0N1Dfum91nd3XOLs71nKdsRrLhDEVay2okl0DSvK1KC+7IeGc1 1omSgHhD1UurLMlqRlM3sABr2n9fPcXcT3glgKlVXffPavQ1gsEucsW6xgXqiXy4WSza OdQ4pWhUwyQ4EbgZcXY83anlUpCoW4cAvFVxrXpeItlTejHwHO+7Qn6clIWRHnE14JAE 0R5OkwGi7BzXZEJx/cclE/HZgUzAmKrEeZGbNqLiiJb8qAMSmQLqOMODX7tKg0RMvlM6 gAXzJgRFt5ju7mnFcVgzyChBAelflGV44z819Q3SVc/h8Buo1qa4HDbZbBlfWnfl9M8H ar2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yx7cuLL3+0qRhgMYucvbk77J8l2k/sPl8YHWPWSFSw8=; b=FxylRUc7cNs3G33vbrJ0xpiunwtSUdJscuY3wARTMeevWfbETku7t9St+rZw7K/1Fu X3OeJg7x5xKLzfh4h6QYlw11R9aYNUSHghMsvY4pKhWyD8aEKJavdToUhPQc+L+hJOh7 QO+hayCitLpnEN2Zwy2Ms/UITXtEt1E7Epb5DKIgpcVv002/GoXV9LHr2Xg7fD520JYV /WPBZrF4ZhYL9BYRLquZ+YFOfPu+aqZgylV8NnwDn55bpqRqpAUm1fSo5Dda+OtVOLp9 W9aBRE+swwCavSQcKyiVokvkPsuoMD/jCLYEVYtakCNgdu4lyxjz+AIwkBfde/gTyOJx /UJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=G4iZsMpu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u14-20020a056a00124e00b0056262d97880si3706158pfi.186.2022.11.11.14.20.55; Fri, 11 Nov 2022 14:21:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=G4iZsMpu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234636AbiKKWTp (ORCPT + 99 others); Fri, 11 Nov 2022 17:19:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234017AbiKKWTX (ORCPT ); Fri, 11 Nov 2022 17:19:23 -0500 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 009A6659F; Fri, 11 Nov 2022 14:19:16 -0800 (PST) Received: by mail-pf1-x434.google.com with SMTP id y13so5998310pfp.7; Fri, 11 Nov 2022 14:19:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yx7cuLL3+0qRhgMYucvbk77J8l2k/sPl8YHWPWSFSw8=; b=G4iZsMpuI3nEGriXixkODoP02isRkQh2sxoomdWZNs0K6nNdhTMskVO8cMKpAqERqw ufEwL02k6KprcVMdwU5XrKtO7iKZ88xyBBdF9kAjTuuTW2KetiSHTmEbNg2Q9O31mrnw VTBNHNqp7jHeGo38JC5lFzDeHkUtKU4NSLVXI45JygOQorDfmR3YpInyMCHyOKgLlwa2 4twbJxK37/GJoYrTzUj/+zf1Af11xNgH2huxWgVCUhnywsrHVw2V+9lBrcR6fDxdE9iP 4UJlNb9du52KvJBWR6hYa848GtOp2PqBEBWSDVsdnrJymOmBMjWnZCinMSVDbwz7w1Py mI8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yx7cuLL3+0qRhgMYucvbk77J8l2k/sPl8YHWPWSFSw8=; b=hWhJXy9bfpwCHhH5tVf8jVPVNq5l1nWGRXAbsCXL7bO0LflVcZpg05HCqPC9hb3/sX pFWjhABS7sa8zvY07bFTL6URfbaNcYgmqk/uaAkrMI8VHzyGIKl5pNw0PMKpS1BjgsiR OpqV10YZ374Z1tCaXp7ygnvE5Fr1jXu/SyQ21daKlP3rINIXYct+6BIB1LffqlPk1VUT dqEM6PsTWKwzNghxgGwdnXKsheS46XA4ZxLLn2/GS10tHmEBZJhJVVml3AQFSyqie0/C 2+p4f3aoRw9z/L12DDe4ZvRmET42W235MegnG0JKSTPmlx4jlQJ4cRXPlppnHWzllXNN iJCw== X-Gm-Message-State: ANoB5plcD0ZBy28uNoUyv2Simc5OfvlDXM+9OTVBh+zRUiG6PugIKxjK vdBDXlv0VO+gzbYZD09WPctN5OjHtWE= X-Received: by 2002:a63:221a:0:b0:464:3985:3c63 with SMTP id i26-20020a63221a000000b0046439853c63mr3396128pgi.141.1668205155875; Fri, 11 Nov 2022 14:19:15 -0800 (PST) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:9d:2:de05:ad1e:65ae:ea4d]) by smtp.gmail.com with ESMTPSA id q9-20020a170902bd8900b00180daa59314sm2201109pls.125.2022.11.11.14.19.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 14:19:15 -0800 (PST) From: Dmitry Torokhov To: Bartosz Golaszewski , Andy Shevchenko , Linus Walleij Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH v4 2/6] gpiolib: acpi: change acpi_find_gpio() to accept firmware node Date: Fri, 11 Nov 2022 14:19:04 -0800 Message-Id: <20221031-gpiolib-swnode-v4-2-6c1671890027@gmail.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog In-Reply-To: <20221031-gpiolib-swnode-v4-0-6c1671890027@gmail.com> References: <20221031-gpiolib-swnode-v4-0-6c1671890027@gmail.com> MIME-Version: 1.0 X-Mailer: b4 0.11.0-dev-28747 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749240008841910966?= X-GMAIL-MSGID: =?utf-8?q?1749240008841910966?= In preparation of switching all ACPI-based GPIO lookups to go through acpi_find_gpio() let's change it to accept device node as its argument as we do not always have access to device structure. Reviewed-by: Andy Shevchenko Acked-by: Linus Walleij Signed-off-by: Dmitry Torokhov --- drivers/gpio/gpiolib-acpi.c | 8 ++++++-- drivers/gpio/gpiolib-acpi.h | 4 ++-- drivers/gpio/gpiolib.c | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 064ba5150fd4..ccb74e208989 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -906,18 +906,22 @@ static bool acpi_can_fallback_to_crs(struct acpi_device *adev, return con_id == NULL; } -struct gpio_desc *acpi_find_gpio(struct device *dev, +struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode, const char *con_id, unsigned int idx, enum gpiod_flags *dflags, unsigned long *lookupflags) { - struct acpi_device *adev = ACPI_COMPANION(dev); + struct acpi_device *adev; struct acpi_gpio_info info; struct gpio_desc *desc; char propname[32]; int i; + adev = to_acpi_device_node(fwnode); + if (!adev) + return ERR_PTR(-ENODEV); + /* Try first from _DSD */ for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) { if (con_id) { diff --git a/drivers/gpio/gpiolib-acpi.h b/drivers/gpio/gpiolib-acpi.h index 01e0cb480a00..bd1f9b92ea9e 100644 --- a/drivers/gpio/gpiolib-acpi.h +++ b/drivers/gpio/gpiolib-acpi.h @@ -60,7 +60,7 @@ int acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags, int acpi_gpio_update_gpiod_lookup_flags(unsigned long *lookupflags, struct acpi_gpio_info *info); -struct gpio_desc *acpi_find_gpio(struct device *dev, +struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode, const char *con_id, unsigned int idx, enum gpiod_flags *dflags, @@ -95,7 +95,7 @@ acpi_gpio_update_gpiod_lookup_flags(unsigned long *lookupflags, } static inline struct gpio_desc * -acpi_find_gpio(struct device *dev, const char *con_id, +acpi_find_gpio(struct fwnode_handle *fwnode, const char *con_id, unsigned int idx, enum gpiod_flags *dflags, unsigned long *lookupflags) { diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index a80fc8abb03f..e874bb0ef685 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -4133,7 +4133,8 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev, con_id, idx, &lookupflags); } else if (is_acpi_node(fwnode)) { dev_dbg(dev, "using ACPI for GPIO lookup\n"); - desc = acpi_find_gpio(dev, con_id, idx, &flags, &lookupflags); + desc = acpi_find_gpio(fwnode, + con_id, idx, &flags, &lookupflags); } /*