From patchwork Fri Nov 18 22:43:35 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: 22788 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp466583wrr; Fri, 18 Nov 2022 15:40:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf7PaVG3tqrkVhzlnX/a/rAJ4Uo+CZpWPvO+eVo83T8cRI4H7Z0zZPiYQFkcVKlLms1SV+6W X-Received: by 2002:a17:906:68c:b0:7ad:dcf7:c4f with SMTP id u12-20020a170906068c00b007addcf70c4fmr7810792ejb.631.1668814823671; Fri, 18 Nov 2022 15:40:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668814823; cv=none; d=google.com; s=arc-20160816; b=A0vpGqvTQYOAycV0D/EssXez8lvC8J6czUe7yfcYJ4kjhsbqiMM356zmDZY7u4BJ8o LKCxTO+QfjAH8fJhgv22o3/77ErgxXDY+NpqZrovo+sy7CPdHiz1rW4kM00ICfq5Zvks +1TPpDja1orbtSOBnrw9narHA6aDlMhfamIKkBf0BXOXWz5+SNuZXNVxtrnUUhD6bVdv wWRsU0K8lW6RMU1vDv0JteHFh6V+hM0cReeuG73qOkp7AGcq1qrc7wUdpruRfo1A3SHA otaA//lMkN0q4BJBdFrezyIfhID3aPRAg2QsEs2BHwhDcn1aBlTfLy6BjmlKkJSZFqEU UiVA== 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=5xzZhx75M1XniCBn1WD2cRYpjZvOEDsnOCPi218IRy0=; b=pd9s5QsONNMe9/So4fbRzpw34rOYrO1Tl1wdkPUAep0ZMZhqXn+kDs6uHz/NVPsl04 Cr9gGss/1xMmzVq06VIQYvhU3xyiyAmhGSa3SJ+Z9GLzbqw5xB6oCdaDDPpzhpX00SSe tFfuacWCyQ25hsawtzgho3SkOV7U1l5uniflpR5x7N//KJkTW3howMchuIwTQxqQaFri RRMAvBEehZgFGl0EE6OyliwqpSZTP3s2WALgmu8V7aNB9VxxiVz5+U5yzPP6b+VUy9eb mEj9xMf4r4clIeL/CqJxbFGmsvyJbvq2arN1Scjma9TZlsPcTJ/ZiIBNQrOIpIRutqzl MRUQ== 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 m21-20020a170906235500b007912fb7ad6esi3363183eja.893.2022.11.18.15.39.57; Fri, 18 Nov 2022 15:40: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 S236550AbiKRXiz (ORCPT + 99 others); Fri, 18 Nov 2022 18:38:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236551AbiKRXdR (ORCPT ); Fri, 18 Nov 2022 18:33: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 593DB4F1BB for ; Fri, 18 Nov 2022 15:21:27 -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 1owA9O-0004T2-FL; Fri, 18 Nov 2022 23:47:58 +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 1owA9L-0058kH-NO; Fri, 18 Nov 2022 23:47:56 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9L-0000O5-W2; Fri, 18 Nov 2022 23:47:56 +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?= , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org Subject: [PATCH 481/606] mfd: wm8994-core: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:43:35 +0100 Message-Id: <20221118224540.619276-482-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?1749879172486867905?= X-GMAIL-MSGID: =?utf-8?q?1749879172486867905?= 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 Acked-by: Charles Keepax --- drivers/mfd/wm8994-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c index 4c0e9378094f..a89221bffde5 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c @@ -621,9 +621,9 @@ static const struct of_device_id wm8994_of_match[] = { }; MODULE_DEVICE_TABLE(of, wm8994_of_match); -static int wm8994_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int wm8994_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); const struct of_device_id *of_id; struct wm8994 *wm8994; int ret; @@ -681,7 +681,7 @@ static struct i2c_driver wm8994_i2c_driver = { .pm = pm_ptr(&wm8994_pm_ops), .of_match_table = wm8994_of_match, }, - .probe = wm8994_i2c_probe, + .probe_new = wm8994_i2c_probe, .remove = wm8994_i2c_remove, .id_table = wm8994_i2c_id, };