From patchwork Fri Nov 18 22:44:48 2022 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: 22920 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp473077wrr; Fri, 18 Nov 2022 16:01:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf6RoIf+WGuTjtpg+c+Pkl1HExib8XW2Dcxi9kX4VgzfL1TScY2G8ikgrvj4czmIndJxLV/W X-Received: by 2002:a17:902:bf44:b0:188:64b8:2402 with SMTP id u4-20020a170902bf4400b0018864b82402mr1777813pls.81.1668816083702; Fri, 18 Nov 2022 16:01:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668816083; cv=none; d=google.com; s=arc-20160816; b=dktbjPLZ8pd7gbdrpJrRvCE6OrPilwxzrMwkedJvsuobJvp0A4cEIpFqrczioyec+o oIHdI6pDzfGDElCIji1HEyWkiOGCZ2nMUO/r4cJgBI0ZlCpPHtSLX89Jc298frVEaLAF jIBgP8NhzIJf7YCgomNzlZ6I7WDkyKcqsxWFgdWXhm2HHkuiadsYxqGEFc7IccYYpoBc ACNrttmRNGvDvKMExhYHCT7s/HQF5YsAK/4RHsbk8PpKcDcYLJedzADxDs3dKSXMGVa/ SIV6YoMrkcQGNlzDHYy1LmzRZSIkRI4o4nCc+6kxV4wWWedzDtPJ5Ogm5AQpwo0ca3iH xJHw== 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=3KagSV5ywun2h7JvW5IxIVY3eZWt4e08ZpdHuMLegNw=; b=MEe9+4fhT82wocKaqiY59Xn1Ev/Bk3r8EKVHm2YDQm3EFy2tI2b2lCOEIWIj9/yLxQ yLJR1dqKluPchIQ6BoA4ympZFJnKjpEOf2zGvVQkvUUDwSQYfGRp2Qx/r2DpLLTqviCx DukuEF5nXoYqpHtnVZmx6+Vq3qx/6rZxoAdJl0nI7XMK6HMGH8yLzH8JMkzQGtrqI5od 1Y136yxmkpPIp8Y2Tiebs4aj6hUq4Q25LaOmWTq5aIZcgRCSUsKOrUcyGOoRxRJmP/aB rtr9GyBwToV77u9LbuyK4RIjPX0etW7sqqVdagwHw8dnNOm1tMJ5CbrL5mN6IcJqAMid t3Gg== 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 c4-20020a621c04000000b0056e109212d8si4485224pfc.287.2022.11.18.16.01.10; Fri, 18 Nov 2022 16:01:23 -0800 (PST) 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 S231448AbiKRX4s (ORCPT + 99 others); Fri, 18 Nov 2022 18:56:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237008AbiKRXzM (ORCPT ); Fri, 18 Nov 2022 18:55:12 -0500 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 4218ACB6A7 for ; Fri, 18 Nov 2022 15:28:10 -0800 (PST) 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 1owA9d-00059n-Rd; Fri, 18 Nov 2022 23:48:13 +0100 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 1owA9b-0058qM-9F; Fri, 18 Nov 2022 23:48:12 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9a-0000Sn-Sw; Fri, 18 Nov 2022 23:48:10 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Liam Girdwood , Mark Brown Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-kernel@vger.kernel.org Subject: [PATCH 554/606] regulator: pv88080-regulator: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:44:48 +0100 Message-Id: <20221118224540.619276-555-uwe@kleine-koenig.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221118224540.619276-1-uwe@kleine-koenig.org> References: <20221118224540.619276-1-uwe@kleine-koenig.org> MIME-Version: 1.0 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.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,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 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?1749880493692388822?= X-GMAIL-MSGID: =?utf-8?q?1749880493692388822?= From: Uwe Kleine-König .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in the probe function. Signed-off-by: Uwe Kleine-König --- drivers/regulator/pv88080-regulator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/pv88080-regulator.c b/drivers/regulator/pv88080-regulator.c index 2a74cc05acfe..15a67c05f519 100644 --- a/drivers/regulator/pv88080-regulator.c +++ b/drivers/regulator/pv88080-regulator.c @@ -374,9 +374,9 @@ static irqreturn_t pv88080_irq_handler(int irq, void *data) /* * I2C driver interface functions */ -static int pv88080_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int pv88080_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct regulator_init_data *init_data = dev_get_platdata(&i2c->dev); struct pv88080 *chip; const struct pv88080_compatible_regmap *regmap_config; @@ -559,7 +559,7 @@ static struct i2c_driver pv88080_regulator_driver = { .name = "pv88080", .of_match_table = of_match_ptr(pv88080_dt_ids), }, - .probe = pv88080_i2c_probe, + .probe_new = pv88080_i2c_probe, .id_table = pv88080_i2c_id, };