From patchwork Fri Nov 18 22:39:51 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: 22860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp472027wrr; Fri, 18 Nov 2022 15:59:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf4ZF7nUytaKtWMpRdQ0+W5juxM8JQQR3R5WwHGDhTl6MejTD23NcTwhRXWT57Y3abqJ0aQM X-Received: by 2002:a65:674e:0:b0:439:3ca9:94a with SMTP id c14-20020a65674e000000b004393ca9094amr8486235pgu.107.1668815947299; Fri, 18 Nov 2022 15:59:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668815947; cv=none; d=google.com; s=arc-20160816; b=HKBZ2JpQcfJcti5GW9oMRVQwEeOkIbj9vbdRnfQDIdOJe4EE9ZxkM6vjNvrr+FSVy6 v80pVf3xkXKg6RqfWamVrGlNimdYgOdu0+w5o15CNwUwcPjNXhd3q2zyZ/eVAg9lKmHw PXxNYNeQyhpzK+ecRfuIVP+YFF+/x1Ws0XjW0iYGhipljQcJLpmUJ3N3DzWaRUvyL/Wy 1FttnYArRJ0qA30FZnAcH0dJhneBd6QOuYecChBuOej7U3w7W2Dprb54c5zBXW2gm0S1 I3H4isIua2XZK/dnwWp8BfbEm3epE+gm/3GgbcQ8eJKgG3rpw8pNlA1Yd4JU4u/zLqQF i7mg== 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=Xi4AneL89CJI7KOj+t0H1G8CqcTySZsihr3yROAMNlY=; b=mUY0Dk252Mxxv8wl7jY776NEBnxScBwOgpYjfmPRgrMEt+OYyTJRmbQELlImGJybGk 5/M+ttQYEXT4eIrAs0lHO4IHlkGkIAP7i4627rpSqO4Gsv7GzrvQRqhuLFhboWqh+wGI anv53iqwNCNI1Cv72s+NWLhshchDcwpS0c+/7Ztb33KJuziVmkpZOiGtPlCX9vlmwML/ 3ru1Dk2yF4j3LyGHbjuNiCehR7cJgcs/ShPQeyXQrvMB4m1Bt6CH7t2vmOoS3XZnI0Jq Ss5dCw0KYCTPJK+6yhfw6vHjpKVcXRUJX7l0CD4WuzvUC90gbA9/bdBvHa9Q5glIZ1Dd O73g== 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 l72-20020a63914b000000b004773c334cf0si1563141pge.155.2022.11.18.15.58.53; Fri, 18 Nov 2022 15:59:07 -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 S232437AbiKRXvp (ORCPT + 99 others); Fri, 18 Nov 2022 18:51:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236889AbiKRXun (ORCPT ); Fri, 18 Nov 2022 18:50:43 -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 75E4EC6632 for ; Fri, 18 Nov 2022 15:26: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-0002M5-Ia; 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-0058S5-OZ; 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 1owA8X-00008K-RJ; Fri, 18 Nov 2022 23:47:05 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Hans de Goede , 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, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 257/606] Input: silead - Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:39:51 +0100 Message-Id: <20221118224540.619276-258-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?1749880350735002563?= X-GMAIL-MSGID: =?utf-8?q?1749880350735002563?= 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 Reviewed-by: Hans de Goede --- drivers/input/touchscreen/silead.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c index 3eef8c01090f..8a7351c4414c 100644 --- a/drivers/input/touchscreen/silead.c +++ b/drivers/input/touchscreen/silead.c @@ -652,9 +652,9 @@ static void silead_disable_regulator(void *arg) regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators); } -static int silead_ts_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int silead_ts_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct silead_ts_data *data; struct device *dev = &client->dev; int error; @@ -826,7 +826,7 @@ MODULE_DEVICE_TABLE(of, silead_ts_of_match); #endif static struct i2c_driver silead_ts_driver = { - .probe = silead_ts_probe, + .probe_new = silead_ts_probe, .id_table = silead_ts_id, .driver = { .name = SILEAD_TS_NAME,