From patchwork Thu May 25 09:56:23 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: 98940 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp254249vqr; Thu, 25 May 2023 03:21:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4cQb+iYTMVCWsYg1s8KWuRrwJ0kqyg7B8Ru0NTHyl4dmLtJuonPrUUfEgT5YzAcfra8f8S X-Received: by 2002:a17:90a:4b87:b0:255:dd84:8643 with SMTP id i7-20020a17090a4b8700b00255dd848643mr1555509pjh.8.1685010064972; Thu, 25 May 2023 03:21:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685010064; cv=none; d=google.com; s=arc-20160816; b=AHYM0tmIx7D0SFxn7MORiy70bvIYY5quIuBPYhP6a49MapPzhEZ2eNNdsMm5zZIdhp fLsMgWTRiaeehY0IHZm5sxFnpInrK6bCQPujcQy1BXULd8qSySebAVlYazm2JV/dFZ7A MYbUH8fgdZy643ToUoNxEd+QDK5eqTTcLNpb/tqtssaClVw4OdD5KQdhUHGkh6U+MzY1 SiVgpKxN790w5MFEcQ99l9zpoq7IxRpyEBmuMX4ickbx8QCbXtl+QSAsRAGoVCKH5X7d 57G0sI9NXqvRXDsdHliWwcnFeNoK+AGlImm9XkAKdGmH4DTTmHTzz6b4RCH9fENZIDpN G6EA== 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=qxeejnT27BZTV9KKu+UfzKzRNUq8MxN0LkhIhtLhvuY=; b=wc59sfeKPF/CTSpuaDIy8FFDCbPb1rRqfo7jSJ54EI25fmHbbBymWTtASzUGCwDl/d jgpgUDKdhgGb+6g7pXKRToSyh8aKBiClPQSvLk2lM8aQdegBT0pnlzmc8wfZIqzDJ+Ci LNRhiafN/wAJutAEuge6+aaiUC7O6V4VqhGTSiqLcX9dLt/GGLkZ0SNi+L6ob8gP50YG R3u39XA+kkc5EID5T6v9+uRurit3jQj5OZP/SrQgGHj+QdBCJ2gWEoGS+myZskbS2Sm5 D7B/ekDkGsCdEWkwRsIix/VAEkULXZ3TSMSovXvnAGjLteVjOJwKYVaFt8utckAXGp4j cK+w== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 2-20020a631842000000b00534769ac796si873010pgy.495.2023.05.25.03.20.52; Thu, 25 May 2023 03:21:04 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240769AbjEYJ4n (ORCPT + 99 others); Thu, 25 May 2023 05:56:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240747AbjEYJ4h (ORCPT ); Thu, 25 May 2023 05:56:37 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F6251A6 for ; Thu, 25 May 2023 02:56:34 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q27hv-000884-9M; Thu, 25 May 2023 11:56:31 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1q27hu-002h3C-9C; Thu, 25 May 2023 11:56:30 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1q27ht-007oDN-Ir; Thu, 25 May 2023 11:56:29 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Krzysztof Kozlowski Cc: Rob Herring , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Philipp Marek Subject: [PATCH 2/3] w1: gpio: Drop unused enable_external_pullup from driver data Date: Thu, 25 May 2023 11:56:23 +0200 Message-Id: <20230525095624.615350-2-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230525095624.615350-1-u.kleine-koenig@pengutronix.de> References: <20230525095624.615350-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2219; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=wlk+inFMM6onbNsMp3REBJLwSwRlU4DLnUXy0UUy6ZY=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBkbzDGZTn3s1FWL0WrHWwKlkcG51UN8vqGmFIrs Jz6JarQPhCJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZG8wxgAKCRCPgPtYfRL+ Tqn8B/4xpUWG5boSPk0b/zSVHy/EQND0ai9bQh5ZaH7oOIQ3iQ4nMrw9hJy0n7KkN2HJUa9QjF3 a20Q1/MD89URMBEKkhGT3muNeWQPNd7siBDXBRe5KMTCUttoz4FiRx7Q54aQa6UGskZ1B9w1Edu KZj6vc9iXYflF/JWuNPNeRudcbxRniIw3rJAQEkYyD/a0Zp2p9tjK3Vk8qcvYECxVqpr5LzMONT +FrKQVNTvBbtjbbFfVRoGxeZIS156FeUTUAHc8Sxe9h+GX+qARmHw7kRDwrI9i6wL2Ea7mgmtUO UJKfqB5rJ9Uosqky9S0Y1Loq3bxtjjr2nabOfOgE1CYnyW/F 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.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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 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?1766861114144814343?= X-GMAIL-MSGID: =?utf-8?q?1766861114144814343?= 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,