From patchwork Fri Nov 18 22:41:16 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: 23019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp478526wrr; Fri, 18 Nov 2022 16:14:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf7G7q5CvLEpo0jtmR9ElTodBeGquLuU9Qus4bmvXyaGpVi/4tybIUkU4VegAZNyb2AnVGpp X-Received: by 2002:a17:906:d0da:b0:7ad:9891:8756 with SMTP id bq26-20020a170906d0da00b007ad98918756mr8043081ejb.203.1668816872421; Fri, 18 Nov 2022 16:14:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668816872; cv=none; d=google.com; s=arc-20160816; b=sGv4qPWwu6+E5XWe+JCpuyTan3VvdI9mwspwxgjdBkGy9dL1rgC2rQU1QL8AY2q/xO sWe+JdiOfNckyl0Etajepxfvo0M8NU6u6eNHuyLV8EFlVasR27nCosiHgHmT3oDhPidh NYBxBte6CjlByZVTB4GoTkck+EEwZ8W2SQf1y1vYJP/k4MGpYnVc0W6hvqme3F3j1UDg v/++UEAHOKC0x1DJdAi/OA+38v+zKUB1tkIPM012uuGkdJMw7uVitPSAW0ZVsy6BowwU iJXvPApd3nRWvpl0bRrBIuOiZ4J8fNPo8hm6qi4rVdxhytCg9oywS6khybrPqciKDkbi nQAA== 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=8mBQq973zDvFCEGRpVkE46Klyzqt5MCyepWwkbeYyW0=; b=kR2tyu79gzpSGHwBtXJvALYgIKu9YzE79dYNfFGwVsYp7ybjhPkDfWTp60SBWsHNzx eZ8wRVjnfjnPijxyxBy6NncqQhotQ0KXWnvPYXkgsteU3oyrxEqqQuFiWe0psOGk3LIu zO5KzknClmbYnvyeDuTBj7NqkaWhcQTvUdVPOAZV9fhPvRWmMaWoG5JbsrC8fE4GDrr5 6AqNALTGgyrlp3HtZOEXH4FyI4DXoC+7nJrNx7hBh5RjnEc/CFbKm/aQR3tPqbkaxFfM jt4b1MEdDBevJIld3c7m7O09gbICISoqkDaQOz5J5RMZHqLRdKZzJ6FR3sAeCzWLpX9i klMg== 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 xg12-20020a170907320c00b007b27afde85csi4573033ejb.707.2022.11.18.16.14.08; Fri, 18 Nov 2022 16:14:32 -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 S237824AbiKSAM5 (ORCPT + 99 others); Fri, 18 Nov 2022 19:12:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237708AbiKSALQ (ORCPT ); Fri, 18 Nov 2022 19:11:16 -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 F0D2943845 for ; Fri, 18 Nov 2022 15:33:37 -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 1owA8u-0003AM-TW; Fri, 18 Nov 2022 23:47:28 +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 1owA8s-0058Z5-EW; Fri, 18 Nov 2022 23:47:27 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA8s-0000Er-KH; Fri, 18 Nov 2022 23:47:26 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Mauro Carvalho Chehab , Sebastian Reichel , Jonathan Cameron , Miguel Ojeda , Jeremy Kerr , =?utf-8?q?Daniel_Gonz=C3=A1lez_Cabanelas?= 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 342/606] media: i2c/ir-kbd-i2c: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:41:16 +0100 Message-Id: <20221118224540.619276-343-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?1749881320529498717?= X-GMAIL-MSGID: =?utf-8?q?1749881320529498717?= 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/ir-kbd-i2c.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c index 25bf1132dbff..51921068931d 100644 --- a/drivers/media/i2c/ir-kbd-i2c.c +++ b/drivers/media/i2c/ir-kbd-i2c.c @@ -757,8 +757,9 @@ static int zilog_tx_duty_cycle(struct rc_dev *dev, u32 duty_cycle) return 0; } -static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) +static int ir_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); char *ir_codes = NULL; const char *name = NULL; u64 rc_proto = RC_PROTO_BIT_UNKNOWN; @@ -987,7 +988,7 @@ static struct i2c_driver ir_kbd_driver = { .driver = { .name = "ir-kbd-i2c", }, - .probe = ir_probe, + .probe_new = ir_probe, .remove = ir_remove, .id_table = ir_kbd_id, };