From patchwork Fri Nov 18 22:44:05 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: 22769 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp465857wrr; Fri, 18 Nov 2022 15:38:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf5gd8g3GK+DiNxlfX9EV3ah3nSWrWFrLQn0/rGhzeJNjGfIGOCIrWaceWYsRIlAFC4SLuOQ X-Received: by 2002:a17:906:3951:b0:7ae:ed2:5367 with SMTP id g17-20020a170906395100b007ae0ed25367mr7673748eje.521.1668814719276; Fri, 18 Nov 2022 15:38:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668814719; cv=none; d=google.com; s=arc-20160816; b=e3LGGwuiupphAsJuverl3raJa1Adch5JmU0HPhPZ1lSI+4JL+WgMIAeBIFR/Kv+13K ATZpxgnUGaihokMUKym+Hbb9QCvz10nJZ9u2h2JrwQ8EEUbx2KXRLQP6N+Lri91IDeQe DkVhlkRZiVmJLyLjjHe7VtNoPuP1uhQ73WgzzUc87iLU/5p3zry3hGxjLW571bqHy3DG ZsTGiCVNTZTlvOaMhAUMRnZxdw2vv6f7c1m3W43f+SIKf6PwQLJ59ljn5XEqzqz2INXm acEyMB+tQHnRdjp2tp5CKI1UPz5Djfguj0cwInj0DNEV5W9egWOC3VxGurOqSj9BIlvs VLLA== 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=KOP+WZGcTwNghN/e+oJnXrCLRIVwRkYtolV5orYZwfU=; b=HBzWdxmsLFzleg16VUYnOCmohy5ttTr5FcVw45kqfOUtRXm3VywJ4AFWO/2RgmswTC ZzT83PTGxJvAu7PlVcWPXiVY1M2j5tcOij0Alj0K9t5NOTh30QlLauKD466ncrcJiuMy HSHL5BaIAfJTz+LqiYvwAIlfyjM2iMbeoKoV9jNii3A6jyX5CKtH1urrxeAojvlkWMiT Mo+ozFFTOm09dDo7+F3SkApsz2G9ElfQweRQQKlO/Ynzj1LP0Lx6uJh07dRtESPx/gp1 rxFZncqLGh2BTpvUYbkBwbzvrmVgz3EBMrb1WMYpsTIbSIqJ5OnO03RNgXAwDpDDMotO 5dEA== 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 i19-20020a1709064fd300b007a087ccd275si4342936ejw.384.2022.11.18.15.38.15; Fri, 18 Nov 2022 15:38:39 -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 S236450AbiKRXgu (ORCPT + 99 others); Fri, 18 Nov 2022 18:36:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236425AbiKRXc5 (ORCPT ); Fri, 18 Nov 2022 18:32:57 -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 CD09883E9A for ; Fri, 18 Nov 2022 15:20:47 -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 1owA9U-0004kF-F6; Fri, 18 Nov 2022 23:48:04 +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 1owA9R-0058mj-PB; Fri, 18 Nov 2022 23:48:02 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9R-0000Q1-SW; Fri, 18 Nov 2022 23:48:01 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Linus Walleij 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 511/606] pinctrl: sx150x: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:44:05 +0100 Message-Id: <20221118224540.619276-512-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?1749879062848812457?= X-GMAIL-MSGID: =?utf-8?q?1749879062848812457?= 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/pinctrl/pinctrl-sx150x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c index a87ea3b95cf4..0b5ff99641e1 100644 --- a/drivers/pinctrl/pinctrl-sx150x.c +++ b/drivers/pinctrl/pinctrl-sx150x.c @@ -1094,9 +1094,9 @@ static const struct regmap_config sx150x_regmap_config = { .volatile_reg = sx150x_reg_volatile, }; -static int sx150x_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int sx150x_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); static const u32 i2c_funcs = I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WRITE_WORD_DATA; struct device *dev = &client->dev; @@ -1252,7 +1252,7 @@ static struct i2c_driver sx150x_driver = { .name = "sx150x-pinctrl", .of_match_table = of_match_ptr(sx150x_of_match), }, - .probe = sx150x_probe, + .probe_new = sx150x_probe, .id_table = sx150x_id, };