From patchwork Tue Oct 17 12:04:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 734769 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77C0CCDB474 for ; Tue, 17 Oct 2023 12:09:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343672AbjJQMI5 (ORCPT ); Tue, 17 Oct 2023 08:08:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343780AbjJQMIJ (ORCPT ); Tue, 17 Oct 2023 08:08:09 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78D4B2738 for ; Tue, 17 Oct 2023 05:05:55 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-405497850dbso54310495e9.0 for ; Tue, 17 Oct 2023 05:05:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1697544353; x=1698149153; 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=CHG7rxCq2i//+W4yV7nUKawChQHAlvElG2FQaJzxjCc=; b=2AVAlLyD9FUtIXez4bcoI60LAyIjPmwwmkRyufVmQ4GUX5Q56QcKWN06/sUQq6YBKA yaDzmZAs9r26yTMCJh27RVb0w941th+mCnYYdF+LFrbFxx5mzCyVx3M1BrUArs6ITAOW nngz6pXM680n5EMzj19bH0U1011JZF9tcIez/NpFny1hc6Rzgk5FxTzgPtUFW0HJaR1y MINfhKNpPvvtlIrZ4Opmc31dScPe5RqjWmYNgzZ6gOtK85XdQ8ZNSoYpUittgzQWtkCf HiqWjNog7yD4DMkGSGVgfm5iVZ4OPTd8vCcIyOZj+F5JRuZ1DiABDokf5aKe4up2KjaT 7iDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697544353; x=1698149153; 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=CHG7rxCq2i//+W4yV7nUKawChQHAlvElG2FQaJzxjCc=; b=dPsUGbtuUECZJg5j4mNavb1QVIUJe62DCkb0SmwyrBOI/P39gnbExgiSO4b52SxKAt mZsRSc9bORoumNM76E4G+gUrvldX7gzy4oIrtpfi7YR2jBzzRDhnSc/qTobgqBvD3ax6 /LmvBpc447L82XnE4VHiD0y/NVxe0AcCgC4SYxLWAHx1V9gfwL2GbLNFI9gH5Wx+Z89P eKGIXlB87JiXLLWs5RmEadHsrQFGpJTbgTEzgw3z/JCGMNEOYmvFu8CtNg0JcYlMBQ/3 zV4qSFrtR7B3JC4UHsKtr68PWMd6LN8ueIMchmgMPlorTMmisKWJGF9AYnZ9LZJY/Uzj u4VA== X-Gm-Message-State: AOJu0Yy0X8uju+jKI7j0luRessTrp3+2L2BC91wYTipIREYi9z8cIbW0 UQsRWVg1Q6MtGp5PFA6TFKVRY1ziWQ7InMQO36I= X-Google-Smtp-Source: AGHT+IHWlh4sDTH1SG2bWxKx5NGny8dO2LAca7pX4mI/k9lxdTYSnlxOxcknmQlpQof7BRuNfggmEA== X-Received: by 2002:a05:600c:350f:b0:405:3dbb:ec5a with SMTP id h15-20020a05600c350f00b004053dbbec5amr1558009wmq.1.1697544353151; Tue, 17 Oct 2023 05:05:53 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:f1ee:b000:ce90:ed14]) by smtp.gmail.com with ESMTPSA id a2-20020a05600c224200b00405442edc69sm1353859wmm.14.2023.10.17.05.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 05:05:52 -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 v3 68/73] pinctrl: starfive: jh7110: drop wrappers around pinctrl_gpio_request/free() Date: Tue, 17 Oct 2023 14:04:26 +0200 Message-Id: <20231017120431.68847-69-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017120431.68847-1-brgl@bgdev.pl> References: <20231017120431.68847-1-brgl@bgdev.pl> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Bartosz Golaszewski pinctrl_gpio_*() helpers now have signatures corresponding with those of the GPIOLIB callbacks. We can drop the wrappers. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c index 695c8c0a6e8b..9d71e8c13310 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c @@ -545,16 +545,6 @@ static const struct pinconf_ops jh7110_pinconf_ops = { .is_generic = true, }; -static int jh7110_gpio_request(struct gpio_chip *gc, unsigned int gpio) -{ - return pinctrl_gpio_request(gc, gpio); -} - -static void jh7110_gpio_free(struct gpio_chip *gc, unsigned int gpio) -{ - pinctrl_gpio_free(gc, gpio); -} - static int jh7110_gpio_get_direction(struct gpio_chip *gc, unsigned int gpio) { @@ -940,8 +930,8 @@ int jh7110_pinctrl_probe(struct platform_device *pdev) sfp->gc.label = dev_name(dev); sfp->gc.owner = THIS_MODULE; - sfp->gc.request = jh7110_gpio_request; - sfp->gc.free = jh7110_gpio_free; + sfp->gc.request = pinctrl_gpio_request; + sfp->gc.free = pinctrl_gpio_free; sfp->gc.get_direction = jh7110_gpio_get_direction; sfp->gc.direction_input = jh7110_gpio_direction_input; sfp->gc.direction_output = jh7110_gpio_direction_output;