From patchwork Fri Nov 18 22:39:53 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: 23000 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp477403wrr; Fri, 18 Nov 2022 16:11:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf7EITOxZMFV86lLHt0pce1zgXlbEK9qCdDP/4lWqtLLDo5cmzRbkbuC2VVXqAKhqhQYTSka X-Received: by 2002:a17:902:a511:b0:187:3bc8:fc56 with SMTP id s17-20020a170902a51100b001873bc8fc56mr1798915plq.83.1668816689211; Fri, 18 Nov 2022 16:11:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668816689; cv=none; d=google.com; s=arc-20160816; b=ufeQbpcClOwOfKHkiKb1eqpTehTGJ+XgTeXQiyJc5z6gptT0HIF7Dlnl+++QS5lRDg jXHUh9+lRPM1aXe6cdGM6Z022wsn/4K7WehEMj++gLy+iBVPJXvx1hxXOdFhUmC8IxV6 cwNuYrdRFHVGOFPcz7zoz3U3I/VylIQbEhES8s1Yz3xF5l+ObM0Ld1zxVAL9njOwamxK nQhf9o+sakztX3gyVYeESVzHvMf0LsmIXUXQ7fiAh5z2Oh/BiVjgdqLherpd089ToCtN rGTHG/s0yRIq6C/adzyPgdoEWfUQtTvHVg7lMQyM3Zm2wsulZhvTNrMt0rFSGJRwnOSP QPeg== 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=QPYSE713NPCfLBtUXwVUYpjTfmlw1OoVrWL0WZIeBGs=; b=R0YGewvN8AOGy48Y1VRL3WMin7HlJrjWJohp08TUFYFxpCppHYuB26ssEwTq8Xamqz 9XpS5j8FgW+iEtPMK9IYcdd02l4akLTZacy9Wq03/++V2DcetHZWT3uxDOoVO2b5/usX 8F6gMcT8Ity+IAREivVbFB/KjHyaR8dVZfdvkAP5LccEmaaQ0V6SC1aKvPBgFrUHDfIz W+5PPh/CANaHPKeeflDny1gLkDRSPTQp1dbNkbcdCPF/ED33k4i9/+HBOr/sU3wn2NCW 2+RKGMw9Y7DWDN0NKivaW8K/llEzK+1i0B3LNyfVSgEK9m4dBMNjUlTvzyCYyLNk20Q0 XsmQ== 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 t191-20020a6381c8000000b0047722bd8f94si3735125pgd.397.2022.11.18.16.11.16; Fri, 18 Nov 2022 16:11:29 -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 S237659AbiKSAKx (ORCPT + 99 others); Fri, 18 Nov 2022 19:10:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237528AbiKSAJv (ORCPT ); Fri, 18 Nov 2022 19:09:51 -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 8772124BDC for ; Fri, 18 Nov 2022 15:33:11 -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 1owA8b-0002OZ-OK; Fri, 18 Nov 2022 23:47:09 +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 1owA8Y-0058Sa-RR; Fri, 18 Nov 2022 23:47:07 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA8Y-00008S-9d; Fri, 18 Nov 2022 23:47:06 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Dmitry Torokhov Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 259/606] Input: st1232 - Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:39:53 +0100 Message-Id: <20221118224540.619276-260-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?1749881128735124709?= X-GMAIL-MSGID: =?utf-8?q?1749881128735124709?= 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/input/touchscreen/st1232.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c index e38ba3e4f183..bd68633dc6c0 100644 --- a/drivers/input/touchscreen/st1232.c +++ b/drivers/input/touchscreen/st1232.c @@ -220,9 +220,9 @@ static const struct st_chip_info st1633_chip_info = { .max_fingers = 5, }; -static int st1232_ts_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int st1232_ts_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); const struct st_chip_info *match; struct st1232_ts_data *ts; struct input_dev *input_dev; @@ -384,7 +384,7 @@ static const struct of_device_id st1232_ts_dt_ids[] = { MODULE_DEVICE_TABLE(of, st1232_ts_dt_ids); static struct i2c_driver st1232_ts_driver = { - .probe = st1232_ts_probe, + .probe_new = st1232_ts_probe, .id_table = st1232_ts_id, .driver = { .name = ST1232_TS_NAME,