From patchwork Fri Nov 18 22:45:36 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: 23107 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp487794wrr; Fri, 18 Nov 2022 16:44:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf6DDk7UmG1lyDjozPwYVLF7Gx9gYPH5c+9cOc7tQeP9RMSUXBKJWiKCdE4pfwW63BroEeMh X-Received: by 2002:aa7:cd50:0:b0:467:2efc:a984 with SMTP id v16-20020aa7cd50000000b004672efca984mr8255465edw.245.1668818645198; Fri, 18 Nov 2022 16:44:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818645; cv=none; d=google.com; s=arc-20160816; b=w6I9YZny2jb5hfwASJCDRbsAulMn9oY2fVrBkukQ19IIV8MNnl5N6APZ+EzpccwzFR ZX9KwkJAl3eh12HplgqqjYElcGDK9nJhiq007jO2oJMP+7r8pnU53o18rnEpBgwc4f2R m2E4XWVa9qScECzqQYJVS+QgiYVDbDBX9DfPgRWUYnkvAOC5T1mdIOYPc/MxTTQ5Sq6R ny69X6T5j2WS991eydZ4i1qMyYl5tVTJE7oCnYxUc42uImvtbAQOBrq06WzFO4YEPZik XrerQaLqfdXwXbkXUfkc0DFQG7DqIK2kiUqJa/K4MR8ZteB0yK1I6igFHhMGIiaQOLul fqOQ== 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=RvxM0C02zH47ZEXilTQnSTg5ExT+35yQz7CVVamy07A=; b=AdGD0Mkl6M8GlNsGr5vLQ5PQ2jJ7RMuZ9hSb4ZEtqwVHUH8hf4oIT+orXUgsj//+Lw GGL7Y+IpITDgEgWgslSgllDWwUluTvPi5fBNJ3432VSaJiQ/CH7zr6wjpYIH+/iO6kto ods5rDZCFEmidmdYkYfe6bps8Yu8E+u7Roa4R2XVFebU7XKVuEfMtQgXr8xncpj3miIy B4ytU94jcw+r4wTB8AtwxlkhN19YbJBHFJU/1AT6Dx2YG6f2sQaKXE8HT+5G98Q/iV0z 6PY5I01Y/yhRIVnmn6KMun/xXJ2Hkx1n8NeWFNBnONqAXmrG0E75xqRx9Kh5pEYRqriR pdIg== 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 ne21-20020a1709077b9500b0079195d87013si4465588ejc.713.2022.11.18.16.43.36; Fri, 18 Nov 2022 16:44:05 -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 S235634AbiKSAgZ (ORCPT + 99 others); Fri, 18 Nov 2022 19:36:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235684AbiKSAfh (ORCPT ); Fri, 18 Nov 2022 19:35:37 -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 1C803116074 for ; Fri, 18 Nov 2022 15:43:14 -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-0005Xg-RK; Fri, 18 Nov 2022 23:48:24 +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 1owA9k-0058uB-Uo; Fri, 18 Nov 2022 23:48:21 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9j-0000Vx-NI; Fri, 18 Nov 2022 23:48:19 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Daniel Mack , Ryan Lee , Charles Keepax , Hui Tang 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, linux-kernel@vger.kernel.org Subject: [PATCH 602/606] ASoC: max98396: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:45:36 +0100 Message-Id: <20221118224540.619276-603-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?1749883179522014990?= X-GMAIL-MSGID: =?utf-8?q?1749883179522014990?= 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 --- sound/soc/codecs/max98396.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/max98396.c b/sound/soc/codecs/max98396.c index a7b6a23f2cd8..db3de41f10e0 100644 --- a/sound/soc/codecs/max98396.c +++ b/sound/soc/codecs/max98396.c @@ -1731,9 +1731,9 @@ static void max98396_supply_disable(void *r) regulator_disable((struct regulator *) r); } -static int max98396_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int max98396_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct max98396_priv *max98396 = NULL; int i, ret, reg; @@ -1907,7 +1907,7 @@ static struct i2c_driver max98396_i2c_driver = { .acpi_match_table = ACPI_PTR(max98396_acpi_match), .pm = &max98396_pm, }, - .probe = max98396_i2c_probe, + .probe_new = max98396_i2c_probe, .id_table = max98396_i2c_id, };