From patchwork Fri Nov 18 22:35:46 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: 22539 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp446801wrr; Fri, 18 Nov 2022 14:47:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf5h6hHqmaieiIlzwXFPNJxw8R4XdWsz5H/z3MzVyFc129l67d+RU9TqYvz3ppwrKrwJ2aob X-Received: by 2002:a17:906:fca7:b0:7ae:9677:d8dd with SMTP id qw7-20020a170906fca700b007ae9677d8ddmr7692450ejb.71.1668811644404; Fri, 18 Nov 2022 14:47:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668811644; cv=none; d=google.com; s=arc-20160816; b=p6X6Kz2pyVqDsSWy91VaXNYGxFumEItPAwXCQbkSGGNsE80egXwO5GMjC3LTqdQszU aT9svdwXQTTvzo7l1KGtgucZOULjw38d/pp6/Zm56P42Noso8rizz8EB5/ZZZjla2nyO 87+dW4OJui8v27J9hJL2MF1xEEfVGcTCiE1JwbEafJgsuo1pVXahCSq6OwPi7mL2SKuz DepTeSryeVD4sl0/ryBo6r+583uRQETQ4GJCGa53OBdfAvLqptd8DL3Ch34YIaS1s2LN JDqvpBBDGGsJb+WhbSLfZLkbLiipYg8kMezvhmvjVOoFGTo7LItwqtNg090DT2X1Hdlr HEHA== 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=czRfT00eYJg7n9F08esiTFZOSKb2m0Cej/Y2gmuZzOs=; b=zxNktsiaO53g2bhPVhhUp6XQe7Hml0JarHnewj/sjlHK36NGFxgv61X/P0rSekK0yG 4Be6cC4Dqn8rKiLjtEp118D1Qtg5zXxmVoeJa5edG3qrksAcjsM9KPLXpXeckHkh1OgC 1X4qgUWM36jmfQXVQnNL9RBu/uqaLIG6CRyeNvhY6moPaMCweC4+7egx6t1gpgfbL3QZ NiL3CNF7k6tX9R1cIhAndkLrjnGizsACXG0JbV3qQfs9vJkCwgtfOch5fsQaDrjo0bCF AqWhcY4kTBA/XLniDuqA0jixIPz/fQHimGvSCgxMKWKY+gOyQNcS3Cpy8suovsDcSH+t Wt5Q== 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 d21-20020a50fb15000000b0045bdff8a884si3798443edq.268.2022.11.18.14.47.00; Fri, 18 Nov 2022 14:47:24 -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 S232142AbiKRWqm (ORCPT + 99 others); Fri, 18 Nov 2022 17:46:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231284AbiKRWqX (ORCPT ); Fri, 18 Nov 2022 17:46:23 -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 7530394A7D for ; Fri, 18 Nov 2022 14:46:22 -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 1owA7g-0007Qx-1p; Fri, 18 Nov 2022 23:46:12 +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 1owA7e-00588a-Cy; Fri, 18 Nov 2022 23:46:11 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA7e-00Havh-C2; Fri, 18 Nov 2022 23:46:10 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Linus Walleij , Bartosz Golaszewski Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 012/606] gpio: pca953x: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:35:46 +0100 Message-Id: <20221118224540.619276-13-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?1749875838652124038?= X-GMAIL-MSGID: =?utf-8?q?1749875838652124038?= 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 Acked-by: Bartosz Golaszewski --- drivers/gpio/gpio-pca953x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 6e67867e1dcd..a59d61cd44b2 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -1050,9 +1050,9 @@ static int device_pca957x_init(struct pca953x_chip *chip, u32 invert) return ret; } -static int pca953x_probe(struct i2c_client *client, - const struct i2c_device_id *i2c_id) +static int pca953x_probe(struct i2c_client *client) { + const struct i2c_device_id *i2c_id = i2c_client_get_device_id(client); struct pca953x_platform_data *pdata; struct pca953x_chip *chip; int irq_base = 0; @@ -1376,7 +1376,7 @@ static struct i2c_driver pca953x_driver = { .of_match_table = pca953x_dt_ids, .acpi_match_table = pca953x_acpi_ids, }, - .probe = pca953x_probe, + .probe_new = pca953x_probe, .remove = pca953x_remove, .id_table = pca953x_id, };