From patchwork Fri Nov 18 22:43:00 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: 22712 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp463187wrr; Fri, 18 Nov 2022 15:31:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf48MH38JJyzDBJOH0jIFlOeyBemiygmMoAKzBn2Qy0NeMaZzvE6iTJfUuHNjPL8akgz6zOA X-Received: by 2002:a17:907:9190:b0:78a:52bb:d904 with SMTP id bp16-20020a170907919000b0078a52bbd904mr7575844ejb.630.1668814311419; Fri, 18 Nov 2022 15:31:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668814311; cv=none; d=google.com; s=arc-20160816; b=V61G7PK0sj4ySOt1SSV7S4gCJMKCOIS0qT9u8e9SSM0FQ7FpB4Ug2oKoLbRg2PL2mG nS+kxieZD3gaznMM5iXlZWnQh+Fv7dh6VF9BaM5ex8A5XQIccPCCCr+9mrsgtSEsESzB di9l3V0NJWyLF5UqsWOi0jTl7cxFE5IEdtxySBEll59Gm+1pQkTi1iy5r05u21cKAcnj iT0tmewvWYM9fE/LokkdOKDDUJ7oBM8Bi4r4yVlhEdBKR8MgW2ZBpavFjrGoTs8HMyKn EDuElplDmxiH8DN9KAbAK+HdMTACxwBdPyCgDszfYTp86vRs4lopXt0JdpW7G+gG4ziL Kfdw== 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=1iYmbEWXQ/1zVdBO/MqzUmtjn+iWbkC73C8IQKwYBoI=; b=z5av5j/DjRQDLlLV9xkKumQseLNjwXKaqJUsMlh7EuMbJca8wA7WJmhmJVWpOW2pS7 m7OFD050DbXK9Yd3Fto7WUnkwrvvmqZ8//zzcVxfn0PBk3SMBpL6xBGt2pMNHRDtZdI4 XrtkE3rCGaw+SimBirysm8JPVnXwkvufRBIFNQz/7dBwOYCea5IZ3PhdcCDZnR93VUBA SGfvLSXXDAFULisTCGyccfGBBKdc8m0KMhJqP07gLU2uVwpf56rGe7iVgkFzzHd1jrLg N4a9syylstA+wI4pGwvX5U2DHdjNns7gNR5HDJ791htO3TYybXgXVxAAmHLrA678H6Te waHg== 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 m11-20020a170906258b00b00767e24156dbsi3174967ejb.256.2022.11.18.15.31.27; Fri, 18 Nov 2022 15:31:51 -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 S236005AbiKRXau (ORCPT + 99 others); Fri, 18 Nov 2022 18:30:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235764AbiKRX3R (ORCPT ); Fri, 18 Nov 2022 18:29:17 -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 8E973C1F49 for ; Fri, 18 Nov 2022 15:17:30 -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 1owA9H-0004As-Il; Fri, 18 Nov 2022 23:47:51 +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 1owA9F-0058hG-Bu; Fri, 18 Nov 2022 23:47:50 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9F-0000Lj-3U; Fri, 18 Nov 2022 23:47:49 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Lee Jones 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 446/606] mfd: mc13xxx-i2c: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:43:00 +0100 Message-Id: <20221118224540.619276-447-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?1749878635160349004?= X-GMAIL-MSGID: =?utf-8?q?1749878635160349004?= 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/mfd/mc13xxx-i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c index 89ab01105460..633b973a5ba7 100644 --- a/drivers/mfd/mc13xxx-i2c.c +++ b/drivers/mfd/mc13xxx-i2c.c @@ -51,9 +51,9 @@ static const struct regmap_config mc13xxx_regmap_i2c_config = { .cache_type = REGCACHE_NONE, }; -static int mc13xxx_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int mc13xxx_i2c_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct mc13xxx *mc13xxx; int ret; @@ -95,7 +95,7 @@ static struct i2c_driver mc13xxx_i2c_driver = { .name = "mc13xxx", .of_match_table = mc13xxx_dt_ids, }, - .probe = mc13xxx_i2c_probe, + .probe_new = mc13xxx_i2c_probe, .remove = mc13xxx_i2c_remove, };