From patchwork Fri Nov 18 22:41:43 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: 22791 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp466659wrr; Fri, 18 Nov 2022 15:40:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf7KUJFjLYzudg6AB8S5RaDP0h0VTtAgtcTC0a+REqLsto2XxCTlJHc3WWV00f2ZD6WXfL2n X-Received: by 2002:a17:906:43d0:b0:78d:a01b:b474 with SMTP id j16-20020a17090643d000b0078da01bb474mr7908936ejn.8.1668814839955; Fri, 18 Nov 2022 15:40:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668814839; cv=none; d=google.com; s=arc-20160816; b=mCPIdtPPOxbx2/p/f4sCIrv25pJxpibqbx0kdnum9zKlZBeUe1JBcwNiZ9w8/6ZaGn SjoRVrpW7Wucbna30DodEWRXEZhYf+kWcshqYhi7x49j1LRWX0GH4HIyExu17o555f2Y to2rw740ST+dtMM/uVeDUoMuOeLtjNna7i8UxUYZ9Pmcsr60j65XTQFun3B9NFcdzTb1 Hcjxqnnju29c55CuO/oMq7oYWrXdm3lHqARrJuSdqcjjpNhzByzh6Vief3ZCkd2ZoKDK n83siBpxJM0Uinx8VrZDrR2Zl6iOKnaj9IKPjgh8dTbfwRKAwk9gU8B6qiXJoF3qBm3R 7abQ== 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=NonN5dtwUtAVefMDcc8Zb2uCqxu2gzVSs1CZ/KTbKHc=; b=PoDrxOW20BQMl2SKJwy+hpPSMb3MQwCejRFLYDo33W2rqBTUEmZMaxubPdEbW+bZHj 802SSfSEGevgvhq19xgV9yc36dh25RYcS209FOPkhAwHiyZylewLpA0nBogc2+ll3484 pnmtBqJPAY3lnIqh5a8drbqEXuM/Cp55NwuV5/d7Mzf6UjsJJ2xPJyQ1aXov8jTiqEBD qBQDLB52k6NIra0N5xsZiPebErohZXqiq3rsDFR/XwcAjviNxBqG0wa69nEr8Idyjvh6 05hicC7vSv67Dn/+Uf2EzyGL1ZfOaLoRTmu/M7DFr+JMMpto0sB566BQwqB2bDBMHNSI EH1w== 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 z1-20020a05640235c100b00458264c2df2si4848501edc.164.2022.11.18.15.40.16; Fri, 18 Nov 2022 15:40:39 -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 S236581AbiKRXjK (ORCPT + 99 others); Fri, 18 Nov 2022 18:39:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236242AbiKRXdm (ORCPT ); Fri, 18 Nov 2022 18:33:42 -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 6EF5AAF088 for ; Fri, 18 Nov 2022 15:21:39 -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 1owA92-0003Tf-99; Fri, 18 Nov 2022 23:47:36 +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 1owA90-0058bM-0v; Fri, 18 Nov 2022 23:47:34 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA90-0000Gc-71; Fri, 18 Nov 2022 23:47:34 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Mauro Carvalho Chehab , Maximilian Luz , Jean Delvare , =?utf-8?q?Krzysztof_Ha=C5=82asa?= , Corey Minyard 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 369/606] media: i2c/saa7127: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:41:43 +0100 Message-Id: <20221118224540.619276-370-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?1749879189621050509?= X-GMAIL-MSGID: =?utf-8?q?1749879189621050509?= 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/saa7127.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/saa7127.c b/drivers/media/i2c/saa7127.c index 78c9388c2ea1..f98f3a1c38a9 100644 --- a/drivers/media/i2c/saa7127.c +++ b/drivers/media/i2c/saa7127.c @@ -708,9 +708,9 @@ static const struct v4l2_subdev_ops saa7127_ops = { /* ----------------------------------------------------------------------- */ -static int saa7127_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int saa7127_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct saa7127_state *state; struct v4l2_subdev *sd; struct v4l2_sliced_vbi_data vbi = { 0, 0, 0, 0 }; /* set to disabled */ @@ -810,7 +810,7 @@ static struct i2c_driver saa7127_driver = { .driver = { .name = "saa7127", }, - .probe = saa7127_probe, + .probe_new = saa7127_probe, .remove = saa7127_remove, .id_table = saa7127_id, };