From patchwork Fri Nov 18 22:41:02 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: 22857 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp472016wrr; Fri, 18 Nov 2022 15:59:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Ag5rv33mpbxVL9khKOuEglTIHJKFmsaSk5kC7k+wyWr1R/ptfs93NjuMblQHsaRZgHCb8 X-Received: by 2002:a17:90b:3d0a:b0:213:3521:f83a with SMTP id pt10-20020a17090b3d0a00b002133521f83amr9894913pjb.84.1668815943539; Fri, 18 Nov 2022 15:59:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668815943; cv=none; d=google.com; s=arc-20160816; b=yM4WoiQ1NZK8tYWftpJoqCuidPg+vqcLCI1k8HhAo56KgvGp5H66xAb3foSD2wMBv2 dt6Cuygw0izOiqmN5xAe+yy+yLrYNNbyrQInkCqEZA4THxrrgNa73PFGgbV7A8g/I/Th 1uz5mVmAbd+QbOKOn0WLzWaXte+tZd1Bz30ifZwo5asIm1xFLh5VHVXYjEzgtJIi2Osx uXLU+rwQ5STWetPxODYAnl1PJzMYfHOQ+o9IX7EaBEOwCtTj5UZUtkQIksI1ym4CMIPe rW+2X2fWxtEwm9YVSEs46q7GqPigEzu22YpXB+LfvVo/nseb0a36T02fSQRh8KecQQOU Re0Q== 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=/DsOJEbFJs7zp/UapmzL9q/Gnnsx7QHGEjHMlnEGrj8=; b=g6gdV9njlRtpj+jHPOcDjeEhmE4bbAXuHIV83Dm65umeKaK3wN2EW/U3W5nSfwLw8E 9glHbUofjMU6XAL0wRJAnXLYFGcxJ5xTM6aDEp07Do3vMrQepHyjW8glCCAkEu0L7Thw aGWeXVaYWeXyhBZP9iD8o/J8wwmsyyVaB95meHyMVbn7Z3yMrplv01DvUXTYLfsdSqp2 RwjxH2u4VBKqyneKFpsvb+kXyoQ8sF/u/X1zjYcv7pY9m3uZlZoZAiye+319CzOb42B3 ocUMIceiB4WoVawBNwmmPlEw6hbzxFQiiz/7TKQLyuflYuDgUqZTbBhtRuDi6/WY+gL8 XW7Q== 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 s11-20020a65584b000000b00476eab03fbasi5362779pgr.865.2022.11.18.15.58.51; Fri, 18 Nov 2022 15:59:03 -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 S233478AbiKRXvm (ORCPT + 99 others); Fri, 18 Nov 2022 18:51:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232732AbiKRXuf (ORCPT ); Fri, 18 Nov 2022 18:50:35 -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 74138C6629 for ; Fri, 18 Nov 2022 15:26:50 -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 1owA8r-00032i-OZ; Fri, 18 Nov 2022 23:47:25 +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 1owA8p-0058Y2-8y; Fri, 18 Nov 2022 23:47:24 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA8p-0000Cz-4x; Fri, 18 Nov 2022 23:47:23 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Lars-Peter Clausen , Mauro Carvalho Chehab 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 328/606] media: i2c/adv7180: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:41:02 +0100 Message-Id: <20221118224540.619276-329-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?1749880346690133702?= X-GMAIL-MSGID: =?utf-8?q?1749880346690133702?= 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/adv7180.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c index 216fe396973f..a22402b7acff 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c @@ -1393,9 +1393,9 @@ static int init_device(struct adv7180_state *state) return ret; } -static int adv7180_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int adv7180_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct device_node *np = client->dev.of_node; struct adv7180_state *state; struct v4l2_subdev *sd; @@ -1610,7 +1610,7 @@ static struct i2c_driver adv7180_driver = { .pm = ADV7180_PM_OPS, .of_match_table = of_match_ptr(adv7180_of_id), }, - .probe = adv7180_probe, + .probe_new = adv7180_probe, .remove = adv7180_remove, .id_table = adv7180_id, };