Received: by 2002:a05:622a:1442:b0:3a5:28ea:c4b9 with SMTP id v2csp446443qtx; Fri, 18 Nov 2022 16:41:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf78W8FEvUCfNni7/NsSllbDP7lQ/42NuWv5NXukzULrcsQ7guA6SrSxpq4k3VmTlKmm6zW+ X-Received: by 2002:a17:906:b2c6:b0:78d:20f7:1294 with SMTP id cf6-20020a170906b2c600b0078d20f71294mr8260605ejb.442.1668818509756; Fri, 18 Nov 2022 16:41:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818509; cv=none; d=google.com; s=arc-20160816; b=ZIaGOssl5R9lpIarGXPtlB23ISiqGsW5FzeLQUAhKh7tvWbVw7w++1X5ZvSXRIN1Nd yGuOTey2mp7hzQTXEDcrZCiCkp4UYFC/yoKKzMT8eiC3np4WN0WNG4RWA4LieYAwwwLJ xE3WryIaG54oky1giwv8Pp8T1bFLt6TCfZoBkxESSTzPxQn18p0jiej0YZzk+unsUos7 95mc98LxYqsX9mUQX40qE6tBw836GBh1473q8RI9iyHt1GUboN+0QwOyj5DnOwEq5a7e 2JunsgIsAGgC1RcUle02x2hXinEsTRQZtfxRSXEDlflPyb3WvmGPnw+BkZfD98vaLxCw f6dw== 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=0iU3sOAedkWdbDbJfjs68ikyWqHy9PanOP94FDLpBFI=; b=cZfAwv6im/0gx5D1d1nWzyseQbgCr0e9Oh4u6hBJ3EwLyKTMV5v8e/w5CzRexPni2/ +AxKAhqNXqH9i3yx727bfJScqznFY7x+KnjO8tSG452WVHbstCbVxRcbIA9xySMS/6gK mgfhmc99DrybZDBcjWg8xcl4+unjd4ienbJwrTy8yYL34e9FHAk/WwH8YIussBg07giy tZAV9r61nfA8mQC0NloZz40PGuVzzvnR87dsY6ZiFEyw/W24Xe0UbNaz3Kuuy8W1L3TQ J4Ere0wdeF+TkKhP4FcQ1o9A6syvxcPU41Lh1sWfIW3ZUMZ5arixI2dSwmTJmq/yNs9+ /oWA== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e20-20020a1709067e1400b007269ef1872esi3401492ejr.897.2022.11.18.16.41.25; Fri, 18 Nov 2022 16:41:49 -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 S237967AbiKSAUl (ORCPT + 90 others); Fri, 18 Nov 2022 19:20:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237839AbiKSAUB (ORCPT ); Fri, 18 Nov 2022 19:20:01 -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 15375FF41E for ; Fri, 18 Nov 2022 15:36:37 -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 1owA9C-0003tc-8T; Fri, 18 Nov 2022 23:47:46 +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 1owA99-0058fE-9m; Fri, 18 Nov 2022 23:47:44 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA99-0000Jx-Be; Fri, 18 Nov 2022 23:47:43 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Michael Hennerich , Lee Jones Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , linux-kernel@vger.kernel.org Subject: [PATCH 417/606] mfd: adp5520: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:42:31 +0100 Message-Id: <20221118224540.619276-418-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 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/adp5520.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c index 882eddc32f8e..cb168efdbafe 100644 --- a/drivers/mfd/adp5520.c +++ b/drivers/mfd/adp5520.c @@ -204,9 +204,9 @@ static int adp5520_remove_subdevs(struct adp5520_chip *chip) return device_for_each_child(chip->dev, NULL, __remove_subdev); } -static int adp5520_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int adp5520_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct adp5520_platform_data *pdata = dev_get_platdata(&client->dev); struct platform_device *pdev; struct adp5520_chip *chip; @@ -340,7 +340,7 @@ static struct i2c_driver adp5520_driver = { .pm = pm_sleep_ptr(&adp5520_pm), .suppress_bind_attrs = true, }, - .probe = adp5520_probe, + .probe_new = adp5520_probe, .id_table = adp5520_id, }; builtin_i2c_driver(adp5520_driver); -- 2.38.1