From patchwork Thu May 25 09:56:24 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: 98950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp260734vqr; Thu, 25 May 2023 03:34:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ79bP4bEW+4F/6w1rQhqJ+186lmRJ3/qDQeLbKfo8M0uq5PfQQgIO149J/kjuaCfT3+tWc4 X-Received: by 2002:a17:902:8d95:b0:1ae:501:e230 with SMTP id v21-20020a1709028d9500b001ae0501e230mr1048400plo.11.1685010868817; Thu, 25 May 2023 03:34:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685010868; cv=none; d=google.com; s=arc-20160816; b=W+OeTVe+jvq2DQlsNQPLZxme2mXBXO9DzUegUwyDNXpuvkzq3KMakC+90fyYFla6ds c0FiTI7rFGRxOjQocKjCnBlsrd/rlBJGf5uiqwSlqPLIn4nIxVXPS5l8+mAdxonWMavE WUQq0wrJZeFTIZ8glcWmG0KQZr85XEhKF50tT4eN8+SeOR9w83uTJjP1w9Up3izZZ9Vf +7P5LnV0jawYzdKVyXLDSo7+3RuviTgMQRNKJ7Mfkif7UokTiOdeEAH+GwNiUDPe/Nci fqlsGQZCgeDODUK3lmXVM9OJVViLcfgHpFP47vUuamE+XnVvxBexZTEK2a8Fe5zTQwU+ Twgw== 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=DC3JQAytQcp6mCCwMNcqXtx4NQIAyVtj8Kg4CfIj3iU=; b=UESAsi2OeDUicNCaVYXVyici36Q/KeRGFVkXSgN1sg7So5BwDFkevdCHCtTAgn26K0 kaGvJneM/P1v+uCO5YyjTos+XFZy0W4cr33sU4L0HgcAGKkKj18rZieCuNHzpAWYCccc Pg7CO9DX2cdT2qdHFZgpDoWqkIFqmsYoaI4sbxNNEdiGRFKixv2w5YOfjj8lNu01VeYJ oBeWyayiEVoruSKKAMGzAp9tNG20CT8VEGKLHcSKC80cdcmoVYTBaaRxqh6EM4rGgFml twDj0ebgsp/oMZTS6l2sdgBB0kaKDUO3Q1Gt/Cc1ozdSAnJ5ws8hYSxqduqhWk04ikPp 4QJQ== 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 t15-20020a170902e84f00b001a64b603189si1293930plg.100.2023.05.25.03.34.13; Thu, 25 May 2023 03:34:28 -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 S240801AbjEYJ4x (ORCPT + 99 others); Thu, 25 May 2023 05:56:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240762AbjEYJ4j (ORCPT ); Thu, 25 May 2023 05:56:39 -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 3F6FB1A7 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-000885-Ei; 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-002h3F-O0; 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-007oDQ-Ot; 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 3/3] w1: gpio: rename pointer to driver data from pdata to ddata Date: Thu, 25 May 2023 11:56:24 +0200 Message-Id: <20230525095624.615350-3-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=4335; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=AL8CVkR6GSrHzRoCdksK3js8JGBEqMjHRgMeJ1Oggjc=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBkbzDH0KELSukdPftEo8RAgyLRMStfIcT+5PD0R yJ4FlQUnNeJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZG8wxwAKCRCPgPtYfRL+ ToyTCAC5m+tHjJxbk2R67TK+LYh2Xcq/tl4oYbKBVtVdT9GRgTeCH5PBijr9h8emMFaGOZt032S vFroEkvptDgSa/UakxeJVBExfQvq7GS8PDcNdqICsyszxT2GAWK4FDp688PrOu3uz3DXhirTSjw cM717ggqNsWD2HmTYZ95Ixc1GYGj4jPEx1cPoGwPi5gSjVOGmT/RuK/CLTNmHFOZd+XEm1U/gyQ EJDuKcTd4yWHQRhJr9Md/FOKyqbY/sSrGwvyuXqSKJjVTedqG0B422+mcdAneA9xV6WUDgSXUUH pxUmsPDMtQoG1R+uwOwzFcdAO+AOhliX4SM9ZtoCwvEnEcKP 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?1766861957108381653?= X-GMAIL-MSGID: =?utf-8?q?1766861957108381653?= pdata is a relict when this was still platform data. Signed-off-by: Uwe Kleine-König --- drivers/w1/masters/w1-gpio.c | 54 ++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c index 67596428f69b..0956ea857226 100644 --- a/drivers/w1/masters/w1-gpio.c +++ b/drivers/w1/masters/w1-gpio.c @@ -25,25 +25,25 @@ struct w1_gpio_ddata { static u8 w1_gpio_set_pullup(void *data, int delay) { - struct w1_gpio_ddata *pdata = data; + struct w1_gpio_ddata *ddata = data; if (delay) { - pdata->pullup_duration = delay; + ddata->pullup_duration = delay; } else { - if (pdata->pullup_duration) { + if (ddata->pullup_duration) { /* * This will OVERRIDE open drain emulation and force-pull * the line high for some time. */ - gpiod_set_raw_value(pdata->gpiod, 1); - msleep(pdata->pullup_duration); + gpiod_set_raw_value(ddata->gpiod, 1); + msleep(ddata->pullup_duration); /* * This will simply set the line as input since we are doing * open drain emulation in the GPIO library. */ - gpiod_set_value(pdata->gpiod, 1); + gpiod_set_value(ddata->gpiod, 1); } - pdata->pullup_duration = 0; + ddata->pullup_duration = 0; } return 0; @@ -51,16 +51,16 @@ static u8 w1_gpio_set_pullup(void *data, int delay) static void w1_gpio_write_bit(void *data, u8 bit) { - struct w1_gpio_ddata *pdata = data; + struct w1_gpio_ddata *ddata = data; - gpiod_set_value(pdata->gpiod, bit); + gpiod_set_value(ddata->gpiod, bit); } static u8 w1_gpio_read_bit(void *data) { - struct w1_gpio_ddata *pdata = data; + struct w1_gpio_ddata *ddata = data; - return gpiod_get_value(pdata->gpiod) ? 1 : 0; + return gpiod_get_value(ddata->gpiod) ? 1 : 0; } #if defined(CONFIG_OF) @@ -74,15 +74,15 @@ MODULE_DEVICE_TABLE(of, w1_gpio_dt_ids); static int w1_gpio_probe(struct platform_device *pdev) { struct w1_bus_master *master; - struct w1_gpio_ddata *pdata; + struct w1_gpio_ddata *ddata; struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; /* Enforce open drain mode by default */ enum gpiod_flags gflags = GPIOD_OUT_LOW_OPEN_DRAIN; int err; - pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); - if (!pdata) + ddata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); + if (!ddata) return -ENOMEM; /* @@ -99,23 +99,23 @@ static int w1_gpio_probe(struct platform_device *pdev) if (!master) return -ENOMEM; - pdata->gpiod = devm_gpiod_get_index(dev, NULL, 0, gflags); - if (IS_ERR(pdata->gpiod)) { + ddata->gpiod = devm_gpiod_get_index(dev, NULL, 0, gflags); + if (IS_ERR(ddata->gpiod)) { dev_err(dev, "gpio_request (pin) failed\n"); - return PTR_ERR(pdata->gpiod); + return PTR_ERR(ddata->gpiod); } - pdata->pullup_gpiod = + ddata->pullup_gpiod = devm_gpiod_get_index_optional(dev, NULL, 1, GPIOD_OUT_LOW); - if (IS_ERR(pdata->pullup_gpiod)) { + if (IS_ERR(ddata->pullup_gpiod)) { dev_err(dev, "gpio_request_one " "(ext_pullup_enable_pin) failed\n"); - return PTR_ERR(pdata->pullup_gpiod); + return PTR_ERR(ddata->pullup_gpiod); } - master->data = pdata; + master->data = ddata; master->read_bit = w1_gpio_read_bit; - gpiod_direction_output(pdata->gpiod, 1); + gpiod_direction_output(ddata->gpiod, 1); master->write_bit = w1_gpio_write_bit; /* @@ -133,8 +133,8 @@ static int w1_gpio_probe(struct platform_device *pdev) return err; } - if (pdata->pullup_gpiod) - gpiod_set_value(pdata->pullup_gpiod, 1); + if (ddata->pullup_gpiod) + gpiod_set_value(ddata->pullup_gpiod, 1); platform_set_drvdata(pdev, master); @@ -144,10 +144,10 @@ static int w1_gpio_probe(struct platform_device *pdev) 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; + struct w1_gpio_ddata *ddata = master->data; - if (pdata->pullup_gpiod) - gpiod_set_value(pdata->pullup_gpiod, 0); + if (ddata->pullup_gpiod) + gpiod_set_value(ddata->pullup_gpiod, 0); w1_remove_master_device(master);