From patchwork Mon Dec 4 22:05:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 173573 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3066517vqy; Mon, 4 Dec 2023 14:05:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IGp0eG0t+FQjIztjaP4WBxE06fPc87nPsz0gm72+xBGV2AOzowD/Odr9R2+t/xzH9TDKNxT X-Received: by 2002:a05:6a00:a0b:b0:6ce:57f2:45fa with SMTP id p11-20020a056a000a0b00b006ce57f245famr272410pfh.49.1701727557925; Mon, 04 Dec 2023 14:05:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701727557; cv=none; d=google.com; s=arc-20160816; b=qzxFk8FC1tV6JOTfagOcpvJgYgnxcI06unlWHazuU77fmRJUAJ7xRr3SC/UBmN8ls7 HVFFnDfzxLOCUR6MwTCRg5LT/7cnuF/BlcPPU7yy19GBho/C9HssnGUBXysZvFxnN835 Ez+2VFjRA2owcfEECKXgAWY2cIhVetMFFB0tcoxMShE9mIJzTpqlwGVFucn5FmDYTRF0 Rtm6TwkDW02Usush920Aqk3tmNYUCEUyDc3FqkHj1Ih0dVxqUOQt3Z+ggUEdaGL5IEee MVFXocIYiXNV4BumTGaaBZzyI+059bGwlg5s6Kk0d4rNjs5XLoeQQfvR9isCHc9+Kd+7 9oHQ== 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; bh=DrgVIi34b8ZYEjDRjjefP6WNBT2H2a7I9AxssTLpbDw=; fh=SRV02Hl1+bLVWhSoERk98/CYHq6XG7S5J1sqaC6oS10=; b=Pxas8PawMST6qORuLN3Xhz5EoXxj9RuaDlILwMRf3DQ6DuNjrgQVMQ2ZQQA2hrDuNh vrEqqxr1JtsISorcgAY9XyTwKXLVAKVkvISXOE0H7QQrUYp5yR43Kdb4ND3r/z+aYqsp JPrHdc7snTsawsLducBRf2ivpWCgJpdhntoQwk1SASLBra2Ad81pK0RsMY9mTTDYflwO iWl+vEZn4+BwwIbmPd1Bl9WifSp8QIhz/E1yLmpFLAdJavfMQw6IP8hjz7hVjHCSlKXb fMv/vSPQkDSishNY1oaywzbhcJNO4ZWOrv5hLSJe3kjaMotYBWZ6XrLQguxvuVYBodnr o0IQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id d20-20020a056a0010d400b006cda012bf20si8527253pfu.264.2023.12.04.14.05.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 14:05:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 1FAA680B6BB8; Mon, 4 Dec 2023 14:05:53 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234464AbjLDWFn (ORCPT + 99 others); Mon, 4 Dec 2023 17:05:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231584AbjLDWF3 (ORCPT ); Mon, 4 Dec 2023 17:05:29 -0500 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 780E5FA for ; Mon, 4 Dec 2023 14:05:35 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rAH4G-0003EO-JY; Mon, 04 Dec 2023 23:05:32 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rAH4G-00DbY3-6U; Mon, 04 Dec 2023 23:05:32 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1rAH4F-00EMX6-TN; Mon, 04 Dec 2023 23:05:31 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Krzysztof Kozlowski Cc: Rob Herring , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH v2 2/3] w1: gpio: Drop unused enable_external_pullup from driver data Date: Mon, 4 Dec 2023 23:05:22 +0100 Message-ID: <7009fc53745c8e0336e9379022ce648a60c519f8.1701727212.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2219; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=iZiYCCot4tFbakRhO9/1l9MMZBqNsQ48MgdJZLGkafQ=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlbk0hf6byIO3pueIYUffdIjp0VJY4K7iFX/YW7 nCF5PvLkDqJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZW5NIQAKCRCPgPtYfRL+ Trg0B/9gatIZe8tiLY8urH16QIiet3H5sbGv6UEua91F2XViJUukPKafvD98uoBvhbmsISw5zMT z1ChyaOwTuYnq6sWYshaES0S094/PcOPG6GSFZBwqgrbB4yZGyGnlJsesKN5Tga1O6rJY8Q67Ja j/lPKtM3ZdQp/qoy2uvF6qf9mNjcLz+L9biPE31+AD5GgczphCbkTwi/pkSq+Z85nrXCytqh8zg +In1zRjJyVQZQYlrjOTpZGEFSEBL5dQdkZB9uOdYruSCnwRZpQWZUtZfEK+mB797hQ4jfPXpMl1 rMKfBn0yNeckcU1hW41StNn31FHt6s2YFShcxGtM+wxneDqt X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.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 (howler.vger.email [0.0.0.0]); Mon, 04 Dec 2023 14:05:53 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784390675517774304 X-GMAIL-MSGID: 1784390675517774304 This member is always NULL, so drop it. That makes the suspend and resume callbacks empty, so they can be dropped, too. Signed-off-by: Uwe Kleine-König --- drivers/w1/masters/w1-gpio.c | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c index 8d65db65178c..67596428f69b 100644 --- a/drivers/w1/masters/w1-gpio.c +++ b/drivers/w1/masters/w1-gpio.c @@ -20,7 +20,6 @@ struct w1_gpio_ddata { struct gpio_desc *gpiod; struct gpio_desc *pullup_gpiod; - void (*enable_external_pullup)(int enable); unsigned int pullup_duration; }; @@ -134,9 +133,6 @@ static int w1_gpio_probe(struct platform_device *pdev) return err; } - if (pdata->enable_external_pullup) - pdata->enable_external_pullup(1); - if (pdata->pullup_gpiod) gpiod_set_value(pdata->pullup_gpiod, 1); @@ -150,9 +146,6 @@ static int w1_gpio_remove(struct platform_device *pdev) struct w1_bus_master *master = platform_get_drvdata(pdev); struct w1_gpio_ddata *pdata = master->data; - if (pdata->enable_external_pullup) - pdata->enable_external_pullup(0); - if (pdata->pullup_gpiod) gpiod_set_value(pdata->pullup_gpiod, 0); @@ -161,34 +154,9 @@ static int w1_gpio_remove(struct platform_device *pdev) return 0; } -static int __maybe_unused w1_gpio_suspend(struct device *dev) -{ - struct w1_bus_master *master = dev_get_drvdata(dev); - struct w1_gpio_ddata *pdata = master->data; - - if (pdata->enable_external_pullup) - pdata->enable_external_pullup(0); - - return 0; -} - -static int __maybe_unused w1_gpio_resume(struct device *dev) -{ - struct w1_bus_master *master = dev_get_drvdata(dev); - struct w1_gpio_ddata *pdata = master->data; - - if (pdata->enable_external_pullup) - pdata->enable_external_pullup(1); - - return 0; -} - -static SIMPLE_DEV_PM_OPS(w1_gpio_pm_ops, w1_gpio_suspend, w1_gpio_resume); - static struct platform_driver w1_gpio_driver = { .driver = { .name = "w1-gpio", - .pm = &w1_gpio_pm_ops, .of_match_table = of_match_ptr(w1_gpio_dt_ids), }, .probe = w1_gpio_probe,