From patchwork Tue Oct 17 12:04:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 154217 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4086171vqb; Tue, 17 Oct 2023 05:09:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE11PDdyEn3WNRVRCBGYJQsA44duT0uE0iCTLzQ3cplBsrp6BdIbKJrCG35UqyVJOqVHpZn X-Received: by 2002:a05:6358:72a6:b0:166:d9c9:dbe with SMTP id w38-20020a05635872a600b00166d9c90dbemr2260303rwf.3.1697544579742; Tue, 17 Oct 2023 05:09:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697544579; cv=none; d=google.com; s=arc-20160816; b=kOcpfpgi46VclmTlBHpLvfXXmbmwNxwbGXGgZJgpiIPr7wiPOIfKqV/0olLlSvhbqs 6XraEsHAbaYJHISkx3AoSQuc/dC4DDKWZRSViLBArpaLK9MqlMJDLpH2ZvRPt75W/5vU T7abr+D7qGjgImqq6eaz31+cmWZ4DZxShrm2ApKqKTgPI6eAKbA1uEzQ11n1XdACzXaf z5EANmKAhNOuZzTGFkbkj95JYtX5fTraH3JNHgiqBbdgxCYnrjX+BH7gIheTK1kV0Xlb bIwR63SEgsodgSKNKHIX5WnJDBu20J6LzSiS15RtZDcxa10I+9ghlt/qXH/ug+dx1zTc GTUA== 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=6qenkA6xUaauonLvrFTXXD5sPq5v8M/Ht2ghe2Ntrw0=; fh=kOxmq+prcfKKX/dgMaMxTb6TRjzyc//QKXZBiaS/a94=; b=NBV/4MIDsaXctYbs9SEwkVqMMH5Xq2q3AZeQ4lmVGAl7qqgc2ZvPl41DzJ38G3JkhT Zzz338SOmtzfLRaoYcuHDqOwN5bQagDr9d5AiwJ0oJf0v1CQfNxYNuIXbCTOYPZE3plh d/ZlcWv4u3xHuevZaZxV53e8VXp2hMZ/D4K4PWZitvQV71/e7ntGc9Y/Kdo/uh5Bx/ig J9GME3Ye1TBJJ+FA7zi4EDdmlYmddiGn1J5W7vS10PCAeLyTCVhsDvyu7SRmksVkFBT6 rV0/tsNtc9j1I9Sr/W3VG+hNd32BF+Vxd6Q4FonAFhlmJ6uyXZJbh4aIyS0nnjFo2s9L YL2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=yl015W87; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id t4-20020a63f344000000b00578b40703bcsi1496337pgj.885.2023.10.17.05.09.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 05:09:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=yl015W87; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 54A9580752B8; Tue, 17 Oct 2023 05:09:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343489AbjJQMJD (ORCPT + 19 others); Tue, 17 Oct 2023 08:09:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343726AbjJQMHr (ORCPT ); Tue, 17 Oct 2023 08:07:47 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BE9B272C for ; Tue, 17 Oct 2023 05:05:54 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40806e4106dso2995865e9.1 for ; Tue, 17 Oct 2023 05:05:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1697544352; x=1698149152; 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=6qenkA6xUaauonLvrFTXXD5sPq5v8M/Ht2ghe2Ntrw0=; b=yl015W87x66JjdrmgBYlXhSC1ilptn8QMzY+J4MiiJ99/Arogz0msko+061uEx506q M7gQ18qfTXz4dsrb3q7DIr7kgEznANR7lWSVML0pHJbOn33G4KNbpt/YU3z0wZFmXeWZ Wt+JBXegCnRu8z0iLPAE5VkmYvyZ9z/Zv4KHmz19jadfoMsqGQG44iRBuQz+WASMnEeP 3NuAzb/LJKVHTsueIBALTMpfXYBqGafMKI2vqJPff5dNf2E9PNk4fgp8vIMVGL3K6ojy 7Y/0GWR1ETy5o33/x9FwqxFowDyeyhQetbvIlFGVHce3wcu+DH5Xny1uV5k5NGVw0u54 FTTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697544352; x=1698149152; 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=6qenkA6xUaauonLvrFTXXD5sPq5v8M/Ht2ghe2Ntrw0=; b=WiawTtUxTVDEBUHGqmdeB3GNTgwgIKIR8xvOH9LnhYKnH+vNgR8RL+ktwzYs0/bm8u 5xc6DtbXx0R5/WfBNjb5r/N5fuXRhCnP1S2c06ELi2JFrwDBiWLBGrh5r3DTDOBO5WPL QZ3UeJg5rezXOiddA6c6pQcqsAoVOBtFz2ty+A2c4kXHj0imWLnAJONQLP6g5S5skXt5 4I3o/myMFjdsGia319yddCFUeyV/aZ+PID5oaY1O3ityaKPC2igttZg97MxcjTA+BQEi RPqEGw4mOxx7i6kW/rv5JO739UYaqC3jnAYQrRaBDwOlY3bEMjHjhDVvdFyHdtJnnf3O FFyw== X-Gm-Message-State: AOJu0YxxEmM4h5ogA+KPRj7L2HTTz1jrgnWhzQPeB83aoA5iklI2c18z nxb0gF97g2Q5Jbsfp7vD/Pv4tQ== X-Received: by 2002:a05:600c:4fd3:b0:402:e68f:8a4f with SMTP id o19-20020a05600c4fd300b00402e68f8a4fmr1608219wmq.0.1697544352447; Tue, 17 Oct 2023 05:05:52 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 05:05:51 -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 67/73] pinctrl: starfive: jh7100: drop wrappers around pinctrl_gpio_request/free() Date: Tue, 17 Oct 2023 14:04:25 +0200 Message-Id: <20231017120431.68847-68-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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Tue, 17 Oct 2023 05:09:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780004505332490593 X-GMAIL-MSGID: 1780004505332490593 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-jh7100.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c index 7beed57d665a..ea70b8c61679 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c @@ -916,16 +916,6 @@ static struct pinctrl_desc starfive_desc = { .custom_conf_items = starfive_pinconf_custom_conf_items, }; -static int starfive_gpio_request(struct gpio_chip *gc, unsigned int gpio) -{ - return pinctrl_gpio_request(gc, gpio); -} - -static void starfive_gpio_free(struct gpio_chip *gc, unsigned int gpio) -{ - pinctrl_gpio_free(gc, gpio); -} - static int starfive_gpio_get_direction(struct gpio_chip *gc, unsigned int gpio) { struct starfive_pinctrl *sfp = container_of(gc, struct starfive_pinctrl, gc); @@ -1309,8 +1299,8 @@ static int starfive_probe(struct platform_device *pdev) sfp->gc.label = dev_name(dev); sfp->gc.owner = THIS_MODULE; - sfp->gc.request = starfive_gpio_request; - sfp->gc.free = starfive_gpio_free; + sfp->gc.request = pinctrl_gpio_request; + sfp->gc.free = pinctrl_gpio_free; sfp->gc.get_direction = starfive_gpio_get_direction; sfp->gc.direction_input = starfive_gpio_direction_input; sfp->gc.direction_output = starfive_gpio_direction_output;