From patchwork Wed Oct 11 12:08:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 151399 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp498501vqb; Wed, 11 Oct 2023 05:23:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFpITwuAoblF15enjHnq5XzTB9yuhJBbhOYIdyLiAFqFoBNcNTR2TjM9j83/DosdsRrivyN X-Received: by 2002:a05:6a20:9393:b0:16c:b95c:6d38 with SMTP id x19-20020a056a20939300b0016cb95c6d38mr13852274pzh.2.1697026991676; Wed, 11 Oct 2023 05:23:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697026991; cv=none; d=google.com; s=arc-20160816; b=ao/xfL5Xn8ZIPvXmV/zNIvhDGQm0cYA2Y6Y+srlSqI98LCVRbNl6dIMyXSSTzU4cFu FCUVrpksj+J0h89vSdMSGTLs6+7hCMuoNtP9UTnmv05AB6NLt/J0aDDDx2kepjQIbJ63 vAm8afW4B0NKGwgbK1G7ug+AxJEebAdD8aF9svebggqE+QMXg7RrUnO3Nr2WTOvN31Ey lRcF/Oj4pOIablh7S9KkXwpugBM3ff1WL1APbcGJuZ3Y7O5gtP0ZSR7qAgmnX6177fJ8 Mu7OMSkT1NfJKgR42075mEDM/TAiantTMq+5HvOAcvWxKqP1NXlcllhGCl6Q4ZYvQc40 xZaA== 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=vydHvbKqcmaUPhEEktsrjJB4doUamk1HoU6kP37WGGw=; fh=kOxmq+prcfKKX/dgMaMxTb6TRjzyc//QKXZBiaS/a94=; b=b2+EODr703Ah6gdR3Ibqb5rea1L89aD3eePolQXkvhhN3hhTzuXN6SmJnduelvoxK7 qqLClI8wM3JVlZ0EhAmqrBWWcJOoQO61BdCqF4Mq8kDuYmJtfS3UXtzB/DjsMml47W6F ZrjMgjmoCfORA2+gpKvax85uf1SBrCcs1BrqPT1eqWrF7dEtfWd0LbTnCLoWI/OvGZf0 PXc8r5C91LqwXifLFQrR4Fx02rzsV5j4jhYKk2C6wi8czttx7y9Ol3APNQUK1bIheZNr RPjHznuvMdv2IXwyeogx8DbHU2K3KjAZ2NAvozfAfJJT4Cb0oSPq//A2dWLxVJP82Esk lohw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=UOD4sFFj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id a2-20020a170902ecc200b001c62cfff798si15527411plh.372.2023.10.11.05.23.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 05:23:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=UOD4sFFj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 88056813568C; Wed, 11 Oct 2023 05:23:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346899AbjJKMWt (ORCPT + 18 others); Wed, 11 Oct 2023 08:22:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346944AbjJKMWS (ORCPT ); Wed, 11 Oct 2023 08:22:18 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9359110EC for ; Wed, 11 Oct 2023 05:09:59 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-405361bb94eso69189985e9.0 for ; Wed, 11 Oct 2023 05:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1697026179; x=1697630979; darn=vger.kernel.org; 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=vydHvbKqcmaUPhEEktsrjJB4doUamk1HoU6kP37WGGw=; b=UOD4sFFjbtImvcz93jTXokzZKbi5Tb1TYtMmDYYKnrSXR7P1ZkW1nNrvcXqX57hoCr q3kyEWb1pfsmJ1MFlG6PwD4c4SJjKHP0cXtb5J+luUvDu/e3EG4GBP7nwe/PajRpcS9L tijFIIDEDm6MzKICZSfem9c/E9iC5uK0EOUb3KrpPrxGvnHcEpjUsi+2tCJOPl2iSV25 0lK3RW9eSzZbOMyBHUaxJUiAuXfMCNdmwd44PwPfXrrDgcwn8PNCIDDsG0XVQsJGFgLZ /4HCBImJTHGQxCbmw71p4lj3UkTCBZf0T9HYv7+DNaiEnbJtyWBfF7BvcKr31l5G1d1n EkJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697026179; x=1697630979; 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=vydHvbKqcmaUPhEEktsrjJB4doUamk1HoU6kP37WGGw=; b=V5dUp8OMLP7oTQd7eu6uC6QZbVyM9MM7LkaZGs5I79x8bq1WbXOS4FrXxxeGxgk19j Xz44d5pCKoPCndAQq0asBd6+ayVgrj6qCldWBunzNu2Tp6keeZpfvHodD+eGXMRmr8dp N1s/detrZCRYDgP/kwO9n9KYEFIE8B7cm6jaPtJu1XinCssfTS/LKLvtp2CaJA0PvQH3 ryeAfe98Fq9HBHIctlqj5Jd9qp/T06WZV09hlda1uueA6k13W6y9f8LgQgOz/B8+jGtF yzPv+8yOgAxnFYsGX5ZfgbAPu8wEpwQhxsU+ZKYwPHWx9NjMeXQWBZhzuYjmd/12/mDM HwfQ== X-Gm-Message-State: AOJu0YypBSS2JwXQOO1LQJQPHw/gyFBnXpT7kAaY6Cq0CsDlkaQ8E952 CT9x+hnET/89KQc+PtUsK8ogrQ== X-Received: by 2002:a05:600c:468d:b0:407:4944:76dc with SMTP id p13-20020a05600c468d00b00407494476dcmr8283375wmo.20.1697026179201; Wed, 11 Oct 2023 05:09:39 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e551:3946:26fc:f94]) by smtp.gmail.com with ESMTPSA id w21-20020a05600c015500b0040652e8ca13sm19012253wmm.43.2023.10.11.05.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 05:09:38 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 35/62] pinctrl: remove pinctrl_gpio_set_config() Date: Wed, 11 Oct 2023 14:08:03 +0200 Message-Id: <20231011120830.49324-36-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231011120830.49324-1-brgl@bgdev.pl> References: <20231011120830.49324-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_SBL_CSS, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 11 Oct 2023 05:23:09 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779461775053463575 X-GMAIL-MSGID: 1779461775053463575 From: Bartosz Golaszewski There are no more users of pinctrl_gpio_set_config() so remove it. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/core.c | 38 ++++++++++++++------------------ include/linux/pinctrl/consumer.h | 1 - 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 9f8027f381b6..99514119c2bd 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -904,27 +904,6 @@ int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset) } EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output_new); -/* This function is deprecated and will be removed. Don't use. */ -int pinctrl_gpio_set_config(unsigned gpio, unsigned long config) -{ - unsigned long configs[] = { config }; - struct pinctrl_gpio_range *range; - struct pinctrl_dev *pctldev; - int ret, pin; - - ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range); - if (ret) - return ret; - - mutex_lock(&pctldev->mutex); - pin = gpio_to_pin(range, gpio); - ret = pinconf_set_config(pctldev, pin, configs, ARRAY_SIZE(configs)); - mutex_unlock(&pctldev->mutex); - - return ret; -} -EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config); - /** * pinctrl_gpio_set_config_new() - Apply config to given GPIO pin * @gc: GPIO chip structure from the GPIO subsystem @@ -938,7 +917,22 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config); int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, unsigned long config) { - return pinctrl_gpio_set_config(gc->base + offset, config); + unsigned long configs[] = { config }; + struct pinctrl_gpio_range *range; + struct pinctrl_dev *pctldev; + int ret, pin; + + ret = pinctrl_get_device_gpio_range(gc->base + offset, &pctldev, + &range); + if (ret) + return ret; + + mutex_lock(&pctldev->mutex); + pin = gpio_to_pin(range, gc->base + offset); + ret = pinconf_set_config(pctldev, pin, configs, ARRAY_SIZE(configs)); + mutex_unlock(&pctldev->mutex); + + return ret; } EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config_new); diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index 4fdc0e570329..bcd09f584525 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -33,7 +33,6 @@ int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset); -int pinctrl_gpio_set_config(unsigned gpio, unsigned long config); int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, unsigned long config);