From patchwork Fri Nov 18 22:42:32 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: 22688 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp462338wrr; Fri, 18 Nov 2022 15:29:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf4JkOXpDQ8dS1HRtnGiTgwt0BDtY462ODCVFACyoSKQSDjfPTDlSxRA3ZGp8wstUPv5IQkD X-Received: by 2002:a17:906:f8cc:b0:7ad:92fa:589e with SMTP id lh12-20020a170906f8cc00b007ad92fa589emr7537500ejb.668.1668814194592; Fri, 18 Nov 2022 15:29:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668814194; cv=none; d=google.com; s=arc-20160816; b=vWmCLhBSnvAkGvevYDDM53UfLcYZk0UvXskuPwieijCAiD2/5iAsehRxffouS1V8/L yJZKoeVX7sBg1RCXGN839XaY/OvCrukg0O2eaMqrVj7p8u7zwDT8CQZgDPbI1BbDxeIy Ju3SnRCaP6oBUr4twy9jsPgrZAq4bMfP7+IXHaNb6804t/hlQtTLI4wLpJx/wOVfjH4R vOMfpXW0M+14yG9N5y3sFSgS0aQfxQSN52MkuF/M6q4hubYp8OjzRdKal/L8DV0SrTl9 hfJMceBgYIgj4DJPOAWTqUuQJ6/r+zYRJrx3h6BCW+qtii6m65QEKBvb2R+dMa54U/wi G9ow== 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=1AAycdecLO+X95X69MeUKZhb1IK4yP7g3yACCR0qlQo=; b=qVyY2ee6+FgbUlzv70h/Iip/UJwAXlvda8eqNXMwIwOf1OL44/mMLXggKU7QJ4bX35 1hXsJUULjD/+hmzHDJn/mvqeegE2CACSdup0Fv+Z4F2hFUMiC9wykd+qJMie6mtgbbIj 4zoRg4AWIKfq5YOrIcZx64758bZsLSfnvdMuEkjgchsW+hXGKOJV6UEwmJfuP4Akgj+D +5+HoijaorRMFpLwQlStFUpUL++QA0gXujvxP2SkquL6CAzyE94P6TqiSQyQqbJlFKyc 4p2ilFcj6bDA9qMNZ6IU3S5sVwK/eqFReHDgabEa61MHa0Z+o6a1q2N3nLwBrOKAXenk FiAw== 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 sd40-20020a1709076e2800b0077a19529760si4262298ejc.65.2022.11.18.15.29.29; Fri, 18 Nov 2022 15:29:54 -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 S235806AbiKRX2z (ORCPT + 99 others); Fri, 18 Nov 2022 18:28:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235768AbiKRX2N (ORCPT ); Fri, 18 Nov 2022 18:28:13 -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 1CA775F5A for ; Fri, 18 Nov 2022 15:16: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 1owA9C-0003uf-KL; Fri, 18 Nov 2022 23:47:46 +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 1owA99-0058fN-N4; Fri, 18 Nov 2022 23:47:44 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA99-0000K0-Hw; Fri, 18 Nov 2022 23:47:43 +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 418/606] mfd: arizona-i2c: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:42:32 +0100 Message-Id: <20221118224540.619276-419-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?1749878512780605888?= X-GMAIL-MSGID: =?utf-8?q?1749878512780605888?= 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/arizona-i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c index 79bda6523cc1..b2301586adbc 100644 --- a/drivers/mfd/arizona-i2c.c +++ b/drivers/mfd/arizona-i2c.c @@ -20,9 +20,9 @@ #include "arizona.h" -static int arizona_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int arizona_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); const void *match_data; struct arizona *arizona; const struct regmap_config *regmap_config = NULL; @@ -120,7 +120,7 @@ static struct i2c_driver arizona_i2c_driver = { .pm = pm_ptr(&arizona_pm_ops), .of_match_table = of_match_ptr(arizona_i2c_of_match), }, - .probe = arizona_i2c_probe, + .probe_new = arizona_i2c_probe, .remove = arizona_i2c_remove, .id_table = arizona_i2c_id, };