From patchwork Fri Nov 18 22:38:48 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: 23045 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp486593wrr; Fri, 18 Nov 2022 16:40:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf44w2Aq/hAXqYgwc9irzVOY7IC69wnPOcLuOGNDV70p5g+BSP3HOZw2vrP4KxMm7ZhhR4Jx X-Received: by 2002:a17:907:2bc2:b0:7ae:bfdb:7706 with SMTP id gv2-20020a1709072bc200b007aebfdb7706mr8279796ejc.207.1668818436744; Fri, 18 Nov 2022 16:40:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818436; cv=none; d=google.com; s=arc-20160816; b=dV2X2oeo7323c59yDTSD41C1YU+YpXYR+26ttLdf66GAIKqv9Xxtx1SO3jVqvkD69P D2dzSKBOQ0glv8H0XMExBxapjILLD+P3IlC6Od4xC2emJ82w2Ds9BMLw0x/QZBONAWgw cRyHIAgV9Ckktg5idtjMNepIoqcGc5W3rFB6nFjbq9GxSK+hPYS5HvBpnS28l8vby1J2 GuYuSljt693Q7Att7bYqvlp+03vxo4qi0j0JkfSIrrpuTnWwKcshm7z2iWF5FMXl3/7S YxH/hjjUm4r7INzKxD4p7LxsFe6VtA2JN6Yg6/GpOjY0ff1I9RPku19dMQ8AmmLLwMHS vYcw== 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=fYN3c0PhXFwvhIScZw73RH3wLFNmTna6UbG15UBi1M0=; b=wwqp73a767LhZXAEy5SiuSgC7QW62m/+Dg161JnibtMOWWcdnqB0VQj9XOSACsyjh6 Iv47uJOdeeeT2jd+aO0qcqCr8PLlzNeSCWiD/OIAlCiAVAtFfyO5646s5BYDCHhx+Hqq NbRHe/5lA1qybna7FmjUNqYAcVzKiT+EBGrPZDl0ocnI5VA90RmZ9Xay1qNo9ReYcFkd wAn9hmebFYiw26ahxqYr6fy6VrvHflkqMbvKozTzhVKk1HobNee57w+UORnI1gxGpEjo TWxK9MBCagHnUrkp8+bRfeo6V9N6K6VC09ilUcA/W7iv/on7o/Wol2o6EoCvmo2f8LFt Sdbg== 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 m19-20020a056402431300b00459060fce1bsi4720051edc.574.2022.11.18.16.40.13; Fri, 18 Nov 2022 16:40:36 -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 S237879AbiKSAVW (ORCPT + 99 others); Fri, 18 Nov 2022 19:21:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237899AbiKSAUz (ORCPT ); Fri, 18 Nov 2022 19:20:55 -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 26B57100B39 for ; Fri, 18 Nov 2022 15:36:54 -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 1owA8L-0001YG-SF; Fri, 18 Nov 2022 23:46:53 +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 1owA8I-0058N5-HK; Fri, 18 Nov 2022 23:46:51 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA8I-00Hb7R-P9; Fri, 18 Nov 2022 23:46:50 +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 194/606] Input: cap11xx - Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:38:48 +0100 Message-Id: <20221118224540.619276-195-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?1749882961389137529?= X-GMAIL-MSGID: =?utf-8?q?1749882961389137529?= 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/cap11xx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c index 7c85343cd32f..79afd0386e3f 100644 --- a/drivers/input/keyboard/cap11xx.c +++ b/drivers/input/keyboard/cap11xx.c @@ -321,9 +321,9 @@ static int cap11xx_init_leds(struct device *dev, } #endif -static int cap11xx_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cap11xx_i2c_probe(struct i2c_client *i2c_client) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c_client); struct device *dev = &i2c_client->dev; struct cap11xx_priv *priv; struct device_node *node; @@ -503,7 +503,7 @@ static struct i2c_driver cap11xx_i2c_driver = { .of_match_table = cap11xx_dt_ids, }, .id_table = cap11xx_i2c_ids, - .probe = cap11xx_i2c_probe, + .probe_new = cap11xx_i2c_probe, }; module_i2c_driver(cap11xx_i2c_driver);