From patchwork Fri Nov 18 22:36:22 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: 22575 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp447800wrr; Fri, 18 Nov 2022 14:50:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf4vvuCVZUH9jnpaqp6XyYMsCECdHhybvoPUni6ybmrWoSPCvOoQrcrtBAcPQAShpWzIZpRg X-Received: by 2002:a17:90a:db0f:b0:218:70ee:e4e5 with SMTP id g15-20020a17090adb0f00b0021870eee4e5mr9857555pjv.28.1668811824787; Fri, 18 Nov 2022 14:50:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668811824; cv=none; d=google.com; s=arc-20160816; b=f9zdoSbOCP30+MvIsFg0DMKAh4WJJEC6jhgga34EIIJYeGdsjnbS2yVkBwkc5z8pYc KoUPg11D1IMId4bqOhXowaXWEb9AdU4W+qB2wnuWbBkEyniAXkPBrBgAS8iS7RDjGfNm tR3O6QhFGSjKGIHHuIz1E1lVG8xbqW/6202Dn4Xa7No69B2GkvNyqckLDZFjAAFBZAGl kkp+ipMaDvfXCXIOlpQWidrY/+/78qHCkdP5N+mJJQR2GZtxe2gDPrbarN0kRsv92UwS 8onxbJcm4QA4AGxfsIeTnKdFLAw6eBSeTeFgQQF2hqRMU6Fzuk6nLcrZAdsJPzcYaOVi 7ijw== 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=dO4qgkeiOsGI0Amj14SSVMtat7IX49tQiWv9vnXtvUA=; b=s0CAfoX7Fw7zWIto1PnfArpKdzyDp2UwI4c1b4KBmJZlfPT8XeggoQgQ7uQV7JPutq WiSSPiJWoV+/4VdRTAvzKBrxaAWNIU6i5ZzBwxEl07PBv3REYz4aP06dosHwvNEkW67x 79fygmYckgPC901aZR8bszZ40sRBs3Ymk4bGRJfxb/9MK2l7yya4278dnQnA+5wggnnS FK0GXUK1So7Py8F7ZFglPAe7C92jKnD+qW9oNMYHUuYwCg9uPCg29g9J+OQBjQ0JgzDQ bTruSzn++ofbjO8s2X4XlFv2fNVpnEDJyW9vv6Lc8tgUx4DiwC/cJymIM0s+ptlJgYFg H0PA== 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 a7-20020a17090a854700b00212f86579f8si7802040pjw.111.2022.11.18.14.50.12; Fri, 18 Nov 2022 14:50: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 S233553AbiKRWtj (ORCPT + 99 others); Fri, 18 Nov 2022 17:49:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232326AbiKRWqw (ORCPT ); Fri, 18 Nov 2022 17:46:52 -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 228B0B8541 for ; Fri, 18 Nov 2022 14:46:39 -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 1owA7s-0007yP-LM; Fri, 18 Nov 2022 23:46:24 +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 1owA7o-0058CH-Qa; Fri, 18 Nov 2022 23:46:21 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA7l-00Haxs-CG; Fri, 18 Nov 2022 23:46:17 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Peter Rosin Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-kernel@vger.kernel.org Subject: [PATCH 048/606] i2c: mux: pca954x: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:36:22 +0100 Message-Id: <20221118224540.619276-49-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?1749876027966841240?= X-GMAIL-MSGID: =?utf-8?q?1749876027966841240?= 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: Peter Rosin --- drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index a5f458b635df..3639e6d7304c 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -411,9 +411,9 @@ static int pca954x_init(struct i2c_client *client, struct pca954x *data) /* * I2C init/probing/exit functions */ -static int pca954x_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int pca954x_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct i2c_adapter *adap = client->adapter; struct device *dev = &client->dev; struct gpio_desc *gpio; @@ -554,7 +554,7 @@ static struct i2c_driver pca954x_driver = { .pm = &pca954x_pm, .of_match_table = pca954x_of_match, }, - .probe = pca954x_probe, + .probe_new = pca954x_probe, .remove = pca954x_remove, .id_table = pca954x_id, };