From patchwork Fri Nov 18 22:42:51 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: 22730 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp464404wrr; Fri, 18 Nov 2022 15:34:48 -0800 (PST) X-Google-Smtp-Source: AA0mqf5UehkQF55zyKY43kNL/H7OHU1tFtqCehM5mbRO0HLEynU2c/ER/+vdxInado3hjgGgPsXT X-Received: by 2002:a17:907:988c:b0:7ad:c2ef:4d69 with SMTP id ja12-20020a170907988c00b007adc2ef4d69mr8138560ejc.10.1668814488009; Fri, 18 Nov 2022 15:34:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668814488; cv=none; d=google.com; s=arc-20160816; b=mGLQGVhTuytWtx5ApQYcljVwwRXrKVADI4VLzjrTA20U1kzs7vHNHnZAoFz4G6z3pe KtyFScF5TRWkqPceJmEUkhaBcXw+oWBncfRrpN8d3jAB/EhTTxqDn8UYyC2PmAqm2lmL r5QMWBvGsKr4E5k4UT5Ei22Yr16CzCtNzu9PBcRIoRmlLpZ2Efr9OwbgP9xdEtYS+Fea hhqrS9Jzi9MYKKiH2hvgRjb9HVXxOnjY2AhiNmQi+d7I+pDdY04bI2ptwmqek+0mD8Mv xkoaKAWMz0ii82I9goysT6kyLrlERP0+8NzZW0B3oVC/v4SF5bUHZMWYG155B06wiJxx u0qw== 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=reBBVqjKUe1oVJ39RM4t83ayt+kgBRd5aB3S4aubACE=; b=nA1eWzP+R2QL+JooujWA4nRrrPfMR5P7YuzqxaJDX551QWLfWK5iVUjYMS45MOnYTy Wtz/yuXBvh3qMtVglkSQ+b88ThqClXkLwvsGYTcosUiKWLDyViyBeaeMBWJsintgqFqQ tviCTvpb2aySDW/RV3gIdS0/KNAyTESYuR7j7MTKqkqxWtguWYRAeRQT3/mrD1YF/IZ0 yjQgfxPEwadIRLDUJvxOTJYsHCndFo9Tk2BQFwDyS27hlj/tbgfhbF1svDAe+If/1RDh xUgfI8z9Ju02WPbNHmNQdA/oplPCB0c7dvmoRN/Xh7F8cOEWkJy55JxXl/7n53C+3SS+ BU2A== 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 jg27-20020a170907971b00b0073d81935416si4784961ejc.749.2022.11.18.15.34.24; Fri, 18 Nov 2022 15:34:47 -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 S234247AbiKRXdh (ORCPT + 99 others); Fri, 18 Nov 2022 18:33:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235848AbiKRXa1 (ORCPT ); Fri, 18 Nov 2022 18:30:27 -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 0449675DAD for ; Fri, 18 Nov 2022 15:18:20 -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 1owA9G-00047E-9p; Fri, 18 Nov 2022 23:47:50 +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 1owA9E-0058gm-0k; Fri, 18 Nov 2022 23:47:48 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9D-0000L8-AP; Fri, 18 Nov 2022 23:47:47 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Charles Keepax , Richard Fitzgerald , Lee Jones Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , alsa-devel@alsa-project.org, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org Subject: [PATCH 437/606] mfd: madera-i2c: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:42:51 +0100 Message-Id: <20221118224540.619276-438-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?1749878820455684583?= X-GMAIL-MSGID: =?utf-8?q?1749878820455684583?= 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/madera-i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/madera-i2c.c b/drivers/mfd/madera-i2c.c index 915d2f95bad3..47e65d88feb0 100644 --- a/drivers/mfd/madera-i2c.c +++ b/drivers/mfd/madera-i2c.c @@ -17,9 +17,9 @@ #include "madera.h" -static int madera_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int madera_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct madera *madera; const struct regmap_config *regmap_16bit_config = NULL; const struct regmap_config *regmap_32bit_config = NULL; @@ -139,7 +139,7 @@ static struct i2c_driver madera_i2c_driver = { .pm = &madera_pm_ops, .of_match_table = of_match_ptr(madera_of_match), }, - .probe = madera_i2c_probe, + .probe_new = madera_i2c_probe, .remove = madera_i2c_remove, .id_table = madera_i2c_id, };