From patchwork Fri Nov 18 22:38:57 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: 22941 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp474721wrr; Fri, 18 Nov 2022 16:04:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf5cL0yJ5sJzcr6skjthQ788gYyZirH86kDAfba8o068auoSpV0aU4kT1oC+KKZTIdKftSyN X-Received: by 2002:aa7:c04f:0:b0:45c:f13b:4b96 with SMTP id k15-20020aa7c04f000000b0045cf13b4b96mr8100574edo.129.1668816289892; Fri, 18 Nov 2022 16:04:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668816289; cv=none; d=google.com; s=arc-20160816; b=wnaRq98k21zI9lMh9x+m8puUOwqN9yULZC0c3S4kriTDW3HxNaI2pfGaV5YJI5rC5h bJ6qx1Im08quodlr/g6Hu3XT7p4mt4jFoDmHkNz6kfq+iqz6hUhbPEGYJqcsIftj+8Ya EcW5PCLCr77Eg0H8jee+3ikTC4qMmduejbCws2j+5senrHhwV5JbLI5soiuD2yogWVGu LdSXTeaky1SJ27mSu/BcHaUueCpKupCsBaycPWQufrQT0Y/uPWDco+dwHPaavUtMcxD+ 55by23iUkn2tLcjp85GTH8x35knvRB8NJTugbDsLdTVyAYNo/C/smP6f4+1ma+xXx4jC MZ6Q== 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=doQS+70H7xmmb/wIs/k/JVUInbbx1xcW2MXtuqZD9vI=; b=SEPeEXV9/ycsxfgOfuXtyF9jvuC/jeaeuYU+bjWTOyFhG3nohr4xEZ5mrRTvCCNwa3 dV6TQRs9FRaKW3Cvmd+QTdVjPz5Wm7kltqz0QeTfYbPJqLwRF+uwMMqeYKxMbJt7gL6l NmY6tkmxsLh6lLNC2/VUqx2zPyw2ZKpTCUcyU/BiSe+eh273Ah5xafMN89pQjhiDinaE nof+X3Sjz711HUwc1rkLXEQ4sh3XkygdVY+HkzUgb7V8o5nrd+lZ1WJSkcxdDIeRzjBv I1lwkNoeoX4fnotMqvDOlK73rZKM9wPHM5Liv9so+n0j4Bbk3WsM/c8AErn8Q95oHP7h S+tw== 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 a26-20020a50ff1a000000b00461dca37cd0si3779674edu.126.2022.11.18.16.04.25; Fri, 18 Nov 2022 16:04:49 -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 S237047AbiKSAAR (ORCPT + 99 others); Fri, 18 Nov 2022 19:00:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237298AbiKRX5Y (ORCPT ); Fri, 18 Nov 2022 18:57:24 -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 D6622C050D for ; Fri, 18 Nov 2022 15:29:01 -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 1owA8O-0001iY-EY; Fri, 18 Nov 2022 23:46:56 +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 1owA8L-0058Nu-3s; Fri, 18 Nov 2022 23:46:54 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA8L-00Hb82-6D; Fri, 18 Nov 2022 23:46:53 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Dmitry Torokhov , Greg Kroah-Hartman , Andy Shevchenko , Luca Ceresoli , =?utf-8?q?Krzysztof_Ha=C5=82asa?= 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 203/606] Input: tca6416-keypad - Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:38:57 +0100 Message-Id: <20221118224540.619276-204-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?1749880710243833965?= X-GMAIL-MSGID: =?utf-8?q?1749880710243833965?= 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/keyboard/tca6416-keypad.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/input/keyboard/tca6416-keypad.c b/drivers/input/keyboard/tca6416-keypad.c index afcdfbb002ff..281d9ec163cc 100644 --- a/drivers/input/keyboard/tca6416-keypad.c +++ b/drivers/input/keyboard/tca6416-keypad.c @@ -194,9 +194,9 @@ static int tca6416_setup_registers(struct tca6416_keypad_chip *chip) return 0; } -static int tca6416_keypad_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int tca6416_keypad_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct tca6416_keys_platform_data *pdata; struct tca6416_keypad_chip *chip; struct input_dev *input; @@ -352,7 +352,7 @@ static struct i2c_driver tca6416_keypad_driver = { .name = "tca6416-keypad", .pm = &tca6416_keypad_dev_pm_ops, }, - .probe = tca6416_keypad_probe, + .probe_new = tca6416_keypad_probe, .remove = tca6416_keypad_remove, .id_table = tca6416_id, };