Received: by 2002:a05:622a:1442:b0:3a5:28ea:c4b9 with SMTP id v2csp451175qtx; Fri, 18 Nov 2022 17:01:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf5vNw/IaPV+Y8Xyoia9XuOpJg736ZxSuiDBLgFyQJSYr5zYqjJphBavGeuYJ4GzkJP8rOtC X-Received: by 2002:a17:902:e80f:b0:186:f4ba:a817 with SMTP id u15-20020a170902e80f00b00186f4baa817mr1974543plg.97.1668819663597; Fri, 18 Nov 2022 17:01:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668819663; cv=none; d=google.com; s=arc-20160816; b=DX3IPJ6gCe6XPsNItVHGNBnXjLSbKN3Seo4VE4/aLeIoNhnkOPJGyB9mzHBk7bWynH 7J+AS2YhK3qp6JJapO2O03loTBx1r6J9pS28GfIJ49lYeg3UYSMIkLio6I36QPrn16Y/ 8NZvuu9frjJ0Ro3SBkT8p0JxaMB8mC8jmxjgFMgeRfckzQ6I3423yfZAv1oioiLa7tjh S4/DSgff+MqKQUESdHVJTt0JbhaB4SHRjH7dbGiExucPclyK2nOg2557FdiSnHR5ZX7P wdwaJZd1OpVHEZSv89hBehhDaEbsrTWfkxLmpq6Ts3qIkYUdUVPoStPV8qRVfGDmeW5g 2O/A== 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=/k8H23rLVMqJ5EpQGiHa/UWRrH9RZLqzXabIK5hYRsA=; b=One+XJEeRPeaDVfwwDcAYcC0gBWmxkE5cVWa6oQ6IQRmqYpgGVEFMlnYw/e3XQ3U1R 9rido3LfJmO01PQKsVhzaAWFmmVaT+mQd9FC+Z1eN/gHpRt7dWs2ucuuduTBwpInWGj3 3jThxlnoK41sAjLG0RHjv9xnXNq9gYwS+ex/0J42IrtLVDSHHdQZDzdZcWeAu/qkfOjj udQMgENiHd6f38IFx0QE9efwkyKysjTlZVWOM/zDqlndGEWlx/6JvurOWcZGQXNJM320 6cJKPL69P578T9tCtsh8VrwTBrSSbfMVJJGxNGMgU/Hzygupkojx71HKC9FQ0JAbp3i+ wb3g== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k71-20020a62844a000000b0053e5ac66c3csi4905825pfd.38.2022.11.18.17.00.51; Fri, 18 Nov 2022 17:01:03 -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 S237615AbiKSAKT (ORCPT + 90 others); Fri, 18 Nov 2022 19:10:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237469AbiKSAJs (ORCPT ); Fri, 18 Nov 2022 19:09:48 -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 2F6FBA659A for ; Fri, 18 Nov 2022 15:33:02 -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 1owA9c-000565-EZ; Fri, 18 Nov 2022 23:48:12 +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 1owA9Z-0058pm-Qh; Fri, 18 Nov 2022 23:48:10 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9Z-0000SV-UD; Fri, 18 Nov 2022 23:48:09 +0100 From: =?UTF-8?q?Uwe=20Kleine-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=20Kleine-K=C3=B6nig?= , linux-kernel@vger.kernel.org Subject: [PATCH 549/606] regulator: max8660: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:44:43 +0100 Message-Id: <20221118224540.619276-550-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 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/max8660.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c index 347043a5a9a7..711623be8eb5 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c @@ -367,9 +367,9 @@ static inline int max8660_pdata_from_dt(struct device *dev, } #endif -static int max8660_probe(struct i2c_client *client, - const struct i2c_device_id *i2c_id) +static int max8660_probe(struct i2c_client *client) { + const struct i2c_device_id *i2c_id = i2c_client_get_device_id(client); struct device *dev = &client->dev; struct max8660_platform_data pdata_of, *pdata = dev_get_platdata(dev); struct regulator_config config = { }; @@ -503,7 +503,7 @@ static const struct i2c_device_id max8660_id[] = { MODULE_DEVICE_TABLE(i2c, max8660_id); static struct i2c_driver max8660_driver = { - .probe = max8660_probe, + .probe_new = max8660_probe, .driver = { .name = "max8660", }, -- 2.38.1