From patchwork Fri Nov 18 22:38: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: 22697 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp462701wrr; Fri, 18 Nov 2022 15:30:48 -0800 (PST) X-Google-Smtp-Source: AA0mqf67bwpwm5U1PIELWazSCmCW0fwJ2Fhxu5sIiQtDoKuB51lK6VHjQyB7zj0pke0/WpfOums5 X-Received: by 2002:a17:907:2b15:b0:78d:51c0:d4d1 with SMTP id gc21-20020a1709072b1500b0078d51c0d4d1mr7674451ejc.161.1668814247971; Fri, 18 Nov 2022 15:30:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668814247; cv=none; d=google.com; s=arc-20160816; b=LgJL+hNevRIZ5d868FaEsQ/0/PIr47b7IYefDO6ViY5YPiRSWUEu8pQIUKcatpFo/k ms/u2gZSIbrUTVIWiANlTTrzQJssFw9xJ/tdNrx2QOtYO5m46zSEWqMCJraHfP29avPt Rx0qHr+seKxASNLcA9/ViqkktNxkd3C9yDIRoBqC263xfOn8k5izSpRzQ7tnJMRHnY9C v49C1+bmZqRFA9ppl8m8yssHzyu2X/chHsOyzwjuVJOeqfhpWOMl5LeZtoyKav619/0Y NmyDhcNFrZCjPgntfQ7jwI51zejrSa2Bl/V4/Z5Joa5mTYnMF7651WHpUnDpo4x0fULg 3s9g== 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=V/lLdpKRyET+668wmlkLyNFlmG770sB6CuFZC9I2Rmg=; b=wTUJmV19supfMhuiVUxS7PGxV+2WURR10Y4qqhIyJRIgfQxeKvFShsjsl2t60i60v3 jRWEGScbv0OlLPjWdI1z54HYsZ5wcHxqZTSyolzEQNjTNCnFORvchAEoqyg+GU0VvzT4 NwNppq37jrxNPp2EGgh6yq07hIy2Unz0FBD18oqoMFo+LXsEXYUAgUG5Wwp4SA2nZsPX 7LQ3h733VP+MTTRsEFK33xNVMLjXiPTgl7DFwVap6YmjW/PSuDFPQkKZwDYT7zGhFnbf lAy+fe2d/XC3S4wDAFrpwiwpsArYKgWJwPv8VcrChOi0NpLK9SgM0y1tdtvhkr6ytmvV W5AA== 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 ft31-20020a170907801f00b007b299051a9fsi3206586ejc.192.2022.11.18.15.30.24; Fri, 18 Nov 2022 15:30:47 -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 S234295AbiKRX3s (ORCPT + 99 others); Fri, 18 Nov 2022 18:29:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235729AbiKRX2q (ORCPT ); Fri, 18 Nov 2022 18:28:46 -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 C637BB949D for ; Fri, 18 Nov 2022 15:16:52 -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-0001XB-Ry; 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-0058N1-AW; 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-00Hb7N-Hq; 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 193/606] Input: adp5589-keys - Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:38:47 +0100 Message-Id: <20221118224540.619276-194-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?1749878568929197257?= X-GMAIL-MSGID: =?utf-8?q?1749878568929197257?= 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/adp5589-keys.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c index bdd264459a97..25c9f6344bf2 100644 --- a/drivers/input/keyboard/adp5589-keys.c +++ b/drivers/input/keyboard/adp5589-keys.c @@ -942,9 +942,9 @@ static void adp5589_clear_config(void *data) adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0); } -static int adp5589_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int adp5589_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct adp5589_kpad *kpad; const struct adp5589_kpad_platform_data *pdata = dev_get_platdata(&client->dev); @@ -1054,7 +1054,7 @@ static struct i2c_driver adp5589_driver = { .name = KBUILD_MODNAME, .pm = &adp5589_dev_pm_ops, }, - .probe = adp5589_probe, + .probe_new = adp5589_probe, .id_table = adp5589_id, };