From patchwork Fri Nov 18 22:43:18 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: 23069 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp486957wrr; Fri, 18 Nov 2022 16:41:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf66udeVnYKuomegMkCaA2nwix31dWwpT/OiRZPFyKVfyBVmsmis05K8/MuxXcccNhHcdoFa X-Received: by 2002:a17:906:3604:b0:78d:99a0:7cf6 with SMTP id q4-20020a170906360400b0078d99a07cf6mr7776649ejb.56.1668818499466; Fri, 18 Nov 2022 16:41:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818499; cv=none; d=google.com; s=arc-20160816; b=YP4+sgyVNQ7Zz1vkvFB093RfyTQgnqhb6jvo5lP+Jj6N/6zXR/FL0L17AXeXILHVix fU5QFl5qSxLkS0k9Vi+QDabJhOmAHJOXiVbb++VeUvfWQ02WunTjb7s40xQYXrFOJYFn WmW7uZQURUqCcBc/io/PVa1nojG5RHVnqWYbVf8GTJRuLi4X9Fl/U+xPd6fiek49Y6xS HvZWYRrOGpQmAGfY/G7GEj34Hp/sWC+bCZThZO1w3deXvZqwMEXrgCFeYt5z/YatEqqd uBqRepliLUxGjMPe/eNdWjF6HI1rSWQltwdU07Jt7qsOJYVGq1vlzbm9dn9eusNLVJV/ F1RQ== 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=J63cD/czlI8dNeuFNeUVRVSgz+8xZ7QayNu2LCju9Lc=; b=ewRGYQjMG4C7MYUBMKebU86+OhBV6XlETaTufa9+sogopwWTga9Adu8BL+BXliDiMJ 5YxzSZhGUzlhJX+cOqAMCsqEi9xOVecOuB6wwKR20W+P4fV1mHmltT5Y/1toavqOxqBy et7Y1nKWpkyNzJSngTrPrBg3rFhW4LkJfCVOR1e3w2JI/7/mG1YyIV7O0zI4ypTmNGE6 0J6zIKmX0hHzXR2CUwmmQjPdche7b8VxXKN6ibgJePnWgy/J+yjZZGWg5G27DiTpjAyO ow5emoTr1Apg2OSctdgOj7Rxw7DSJDGAKGxjSq7s8k5bUegaLQ3+nJA2Na9zJ6dY8kTk uO1Q== 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 j27-20020a170906279b00b0073155abc1b8si3142826ejc.154.2022.11.18.16.41.14; Fri, 18 Nov 2022 16:41: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 S236687AbiKSAgb (ORCPT + 99 others); Fri, 18 Nov 2022 19:36:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235467AbiKSAfl (ORCPT ); Fri, 18 Nov 2022 19:35:41 -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 70B9D1165B3 for ; Fri, 18 Nov 2022 15:43:16 -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 1owA9L-0004Jp-5u; Fri, 18 Nov 2022 23:47:55 +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 1owA9I-0058is-Fd; Fri, 18 Nov 2022 23:47:53 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9I-0000My-MA; Fri, 18 Nov 2022 23:47:52 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Lee Jones 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 464/606] mfd: tc3589x: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:43:18 +0100 Message-Id: <20221118224540.619276-465-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?1749883026519893284?= X-GMAIL-MSGID: =?utf-8?q?1749883026519893284?= 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/mfd/tc3589x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c index 5d932cf3808a..1f6e0d682cd9 100644 --- a/drivers/mfd/tc3589x.c +++ b/drivers/mfd/tc3589x.c @@ -352,9 +352,9 @@ tc3589x_of_probe(struct device *dev, enum tc3589x_version *version) return pdata; } -static int tc3589x_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int tc3589x_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct device_node *np = i2c->dev.of_node; struct tc3589x_platform_data *pdata = dev_get_platdata(&i2c->dev); struct tc3589x *tc3589x; @@ -485,7 +485,7 @@ static struct i2c_driver tc3589x_driver = { .pm = pm_sleep_ptr(&tc3589x_dev_pm_ops), .of_match_table = of_match_ptr(tc3589x_match), }, - .probe = tc3589x_probe, + .probe_new = tc3589x_probe, .remove = tc3589x_remove, .id_table = tc3589x_id, };