From patchwork Fri Nov 18 22:41:55 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: 22816 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp470703wrr; Fri, 18 Nov 2022 15:54:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf6aTVSGguc8rRLAoZDvMLJdIfg21AxfoC0A6ojhO06//T00rIkXAc7akSjQ4BgUyWDKBCdj X-Received: by 2002:aa7:c9d0:0:b0:458:ed79:ed5 with SMTP id i16-20020aa7c9d0000000b00458ed790ed5mr8092310edt.374.1668815664240; Fri, 18 Nov 2022 15:54:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668815664; cv=none; d=google.com; s=arc-20160816; b=nfHS58jRmiUkQP1tqTdS3FYAy6BQbTH4G2xSaK4lXiiegrL4NpR/gTM4mXE8tjK0vz UYq/VUR77U6H2AGkbYckPjVhuuQwt/7pRB4GD4fX+noAvwuqwovVvi1CHbNIYQud/Rd3 ucrtiXhLtVY//hNdhM+NTm5cnn6FvHoBYqui3l5+G7Vn/1TkXJIFeuaT+Vyo38zuZkyt wx16sfAnsFi5JgAnWDKhs8VGtPUJ4c6optAbX8xCOK+Fs+8eW4bnp3j7OTKbMwCjQev2 9ybAewymMzOlgNklaS5EYHL7RqvjHr7koFBrtRSA0fjR1QeFZ6fANimZ2IkzIw3d4k0A mYNA== 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=u18/IIinsdlmMNS253Y7TY8NYA0KIBgVBC9nvUGlu64=; b=ZpuEnGuEPovV2FK1b5Q9+pMYYnQxw/UDkO2r2jpaRdHYou6aiia/2sy71o3ASON5mw VEp+Wx/kaPOVG2AF2V3fJyFhQTczxf8oq3iz1+4y57+Z0g/2b+8VSx1euIDcWytu8ti6 iReng/bOuPb3zsB5mc/UV6sN+sXYoK/kloTRHi9O8WllkFDERHtkFB2kAI5YkSW5dran jKAt/sEi18THO3P038BvRhuDkhjRJjR7xg/4PDZyyl2gBTlHg6j5daqd3K7jz2byhJac XoDLdE3MKd0svUp5RBLf00o/K3bFD5263yOmHn7FlHl51wNvzbxbe4PtE8A1vXEoRyZ8 Bc9w== 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 g20-20020a056402321400b00458e689f41fsi3879573eda.415.2022.11.18.15.54.00; Fri, 18 Nov 2022 15:54:24 -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 S236712AbiKRXk2 (ORCPT + 99 others); Fri, 18 Nov 2022 18:40:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236789AbiKRXhz (ORCPT ); Fri, 18 Nov 2022 18:37:55 -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 105E88E280 for ; Fri, 18 Nov 2022 15:22:36 -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 1owA94-0003Zs-HK; Fri, 18 Nov 2022 23:47:38 +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 1owA92-0058cI-8u; Fri, 18 Nov 2022 23:47:37 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA92-0000Hc-BY; Fri, 18 Nov 2022 23:47:36 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Mauro Carvalho Chehab , Adrien Grassein , Jonathan Cameron , Crt Mori , Andy Shevchenko Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 381/606] media: i2c/tvaudio: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:41:55 +0100 Message-Id: <20221118224540.619276-382-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=ham 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?1749880054158400722?= X-GMAIL-MSGID: =?utf-8?q?1749880054158400722?= 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/media/i2c/tvaudio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/tvaudio.c b/drivers/media/i2c/tvaudio.c index 9f1ed078b661..a54c76d9e23b 100644 --- a/drivers/media/i2c/tvaudio.c +++ b/drivers/media/i2c/tvaudio.c @@ -1934,8 +1934,9 @@ static const struct v4l2_subdev_ops tvaudio_ops = { /* i2c registration */ -static int tvaudio_probe(struct i2c_client *client, const struct i2c_device_id *id) +static int tvaudio_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct CHIPSTATE *chip; struct CHIPDESC *desc; struct v4l2_subdev *sd; @@ -2094,7 +2095,7 @@ static struct i2c_driver tvaudio_driver = { .driver = { .name = "tvaudio", }, - .probe = tvaudio_probe, + .probe_new = tvaudio_probe, .remove = tvaudio_remove, .id_table = tvaudio_id, };