From patchwork Fri Nov 18 22:43:32 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: 22644 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp460510wrr; Fri, 18 Nov 2022 15:24:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf5AdRyAJlUuAfaF/ujZq7SKTqA2WJ+VwyhxrPAKxOfKtPAZ321LqSdbwV3yDH1TEQYdPnzY X-Received: by 2002:a05:6402:1648:b0:458:dbc5:67c5 with SMTP id s8-20020a056402164800b00458dbc567c5mr8154566edx.214.1668813869598; Fri, 18 Nov 2022 15:24:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668813869; cv=none; d=google.com; s=arc-20160816; b=Lks8US1U7lHTHQxzP0BAc0LZ3+sxvmjkr9HgrHBqn9axg3ZfrR/t0uyHSmoAmzJ5cq 6j/BthHX0v0Ghd1SrapNfkNlxvO0de76c8eK83sMUPPg7FBmeNWZXVx7k169y/+ZFBlk PW4Q5+XPQSqR7wxG05U9qwUNkdksxX4uEYD9Fdkn2tQkHXnLRo7hCJ9fAe/BvxZclATa 1d2d233xiH17yluwLj3FZmg0bJtzYn27qjD+3bsSxCo9+MU8609RyL6U7jODKUQtvv2s TgXGQZDHOqs8Psdq4NOBEcQVPBIBA8ZixCpqV3zcahEWlbVd3OgSPJSh8B6ebSve7oOP 7R9Q== 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=L8vucUPv/BuX8VecPLwUksWQsvE67JP2bSBEEU7K0+Y=; b=hsbCJpCJbBOPyEmgROmylfzl64CwCiA/Uei1SO36WtV5iDMEl9tOvvxR5SdAMZ3S2u TyEJxw59cAiEk3H6Rf00Ra+kUg2Dow95mqkO8XOzpBWvhH5K6/ygIKk8L/oKkVpoofhS 8VSWcfFPf1sCW4bkgfAxr8t1BZKD4q4ondq4IM9Lznk3zt22EkiB0MQ2ofJmjX0Vc+7W hDYsqNCKhgHeOd3kF3lItpd7TdytDYecxV/3MAzgxBYb8tjGH4Okzp8Vk0lsd9uBTsWi cXXQmPmgguPyc2MHvlwG6dY92H0fNCA11mqXtAzumeIBL2VwajlkD2RMdb/2sZqey8TU Y7tQ== 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 xj10-20020a170906db0a00b007adef1dceffsi4295757ejb.677.2022.11.18.15.24.02; Fri, 18 Nov 2022 15:24:29 -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 S234494AbiKRXXD (ORCPT + 99 others); Fri, 18 Nov 2022 18:23:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230228AbiKRXVK (ORCPT ); Fri, 18 Nov 2022 18:21:10 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [85.220.165.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E350452153 for ; Fri, 18 Nov 2022 15:12:21 -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 1owA9O-0004SK-5A; Fri, 18 Nov 2022 23:47:58 +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 1owA9L-0058kC-E8; Fri, 18 Nov 2022 23:47:56 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9L-0000Nt-ES; Fri, 18 Nov 2022 23:47:55 +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?= , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org Subject: [PATCH 478/606] mfd: wm831x-i2c: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:43:32 +0100 Message-Id: <20221118224540.619276-479-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=ham 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?1749878172497521228?= X-GMAIL-MSGID: =?utf-8?q?1749878172497521228?= 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: Charles Keepax --- drivers/mfd/wm831x-i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c index daa1ad036595..9dbe96e2d46a 100644 --- a/drivers/mfd/wm831x-i2c.c +++ b/drivers/mfd/wm831x-i2c.c @@ -21,9 +21,9 @@ #include #include -static int wm831x_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int wm831x_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct wm831x_pdata *pdata = dev_get_platdata(&i2c->dev); const struct of_device_id *of_id; struct wm831x *wm831x; @@ -102,7 +102,7 @@ static struct i2c_driver wm831x_i2c_driver = { .of_match_table = of_match_ptr(wm831x_of_match), .suppress_bind_attrs = true, }, - .probe = wm831x_i2c_probe, + .probe_new = wm831x_i2c_probe, .id_table = wm831x_i2c_id, };