From patchwork Fri Nov 18 22:39:47 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: 22978 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp476664wrr; Fri, 18 Nov 2022 16:09:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf4RMJJ8e/YZ+s9DOM9h8Pn4kEjbYHDftnwefb7hsJakaYBKJWBRzJYRm5g/YErfdB5pbIA0 X-Received: by 2002:a17:90a:4283:b0:218:4953:58aa with SMTP id p3-20020a17090a428300b00218495358aamr16082341pjg.219.1668816580640; Fri, 18 Nov 2022 16:09:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668816580; cv=none; d=google.com; s=arc-20160816; b=vLL8oaqgHH+36EnJoRQTZ5HjRqg7nLUnvEXPi9CeK5SP2/zVwmBkdYVIvhknqghrF+ BImKaTCwH9S01VGsnSzwWMtCWMF2e6lGhV0DMvSVMMCJawPT+PD5Cxh0QUo0aBGCykJl ChN5p93xTow9achDJe7P8HQJcMRw8jIXLTlw1R8feOUZG7oCyoJL7Q1GQitO1JHNfUU9 CDDbhrOOrLjuGpu2UMdgWLvLmLnkok1m7+NpzUM+utwaSaLolDJDOG7LcBJYp2NOYhhV 0WH8awrRGMRBlVtBwyevBwdGkrg2tvbyKkSPMGaiP7c2O4Sq4hfWw0zWaijyYxeQFgpE EV8g== 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=B6w/KYztBkdBeoUlj8/UXuBQv1UOVy9JqGgHkI7YNBs=; b=eWijsAu2uS2IXVyZpxrn6LNFtysaFq0dUuCcLlD9o8Yw8f/pD8hIifJ9L/VCdHczix zYJ9zC2oMLAZY/2SmzF12qmM2TUp0lyZEbFZuO3z8FiNmTPpaRYll0N2C70s7dk3gPxo FPvhLxradCGa9FGm+sH3UI+LVKQd4z8qMHxZ+A7i35iZ9wJh9IEDsr4RZsEzlkAAA77Z v+xUQ9qIyNmb3io+BNFZtMAyk4rNt9ySnqlH06hYWM0ravnOghDlr2ECVkGMAdEoGhcz 1NeZe33qoGP+G0DLuuoTWaUvjyf5VGqDNNKEVg677oqNmyGGWYj28pB5UmfHs7ULtn8Q dfbA== 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 w11-20020a170902ca0b00b001869cf73143si4169322pld.314.2022.11.18.16.09.28; Fri, 18 Nov 2022 16:09:40 -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 S237411AbiKSAEZ (ORCPT + 99 others); Fri, 18 Nov 2022 19:04:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238004AbiKSADj (ORCPT ); Fri, 18 Nov 2022 19:03:39 -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 EBF1CCFBAA for ; Fri, 18 Nov 2022 15:30:51 -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 1owA8a-0002MF-8r; Fri, 18 Nov 2022 23:47:08 +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 1owA8X-0058S8-Q3; Fri, 18 Nov 2022 23:47:06 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA8W-000085-VX; Fri, 18 Nov 2022 23:47:04 +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 253/606] Input: pixcir_i2c_ts - Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:39:47 +0100 Message-Id: <20221118224540.619276-254-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?1749881015030927419?= X-GMAIL-MSGID: =?utf-8?q?1749881015030927419?= 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/pixcir_i2c_ts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c index dc148b4bed74..7959947a3458 100644 --- a/drivers/input/touchscreen/pixcir_i2c_ts.c +++ b/drivers/input/touchscreen/pixcir_i2c_ts.c @@ -462,9 +462,9 @@ static int __maybe_unused pixcir_i2c_ts_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(pixcir_dev_pm_ops, pixcir_i2c_ts_suspend, pixcir_i2c_ts_resume); -static int pixcir_i2c_ts_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int pixcir_i2c_ts_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct device *dev = &client->dev; struct pixcir_i2c_ts_data *tsdata; struct input_dev *input; @@ -617,7 +617,7 @@ static struct i2c_driver pixcir_i2c_ts_driver = { .pm = &pixcir_dev_pm_ops, .of_match_table = of_match_ptr(pixcir_of_match), }, - .probe = pixcir_i2c_ts_probe, + .probe_new = pixcir_i2c_ts_probe, .id_table = pixcir_i2c_ts_id, };