Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp1344537rwb; Fri, 18 Nov 2022 17:10:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf42cfs/yj0BvMhS9Fc6ydyViNP9ElHqpTxSHxw3loLGfXzK8RG0B2TtBKSwDN+A49hRcNof X-Received: by 2002:a17:906:7ac8:b0:7ad:c8d6:bc7f with SMTP id k8-20020a1709067ac800b007adc8d6bc7fmr7903858ejo.118.1668820220934; Fri, 18 Nov 2022 17:10:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668820220; cv=none; d=google.com; s=arc-20160816; b=V/YZ9KO+TtwkfrxRShLMH+kBGMYbTbQta19Or3jN2ASEdNmUnnq0LIblGYonpV0g7O rWB3aXLCfeDo1wX0J6D/ALOVyFg1Go1/bS3PeQD1OXuM1QvgTt9wNXoxSsTykUXddyBK 1SbAgS+khFriookuprX00v6vlZJHz7VnkvzVqA23hiLSPyRF5Sj6FNNSLD8Bn+5bIhSW JCU6/EFLlGuyi9JLOnf9nM2KYwliu7YkndfjcR+fKFGSYm0MKN2FKNvLau7acc+jrdD7 RIW8RfkuZoJYzG7B7grf+fx1fEC5vCoCmhiAtYuJqY0t98juW9SjJ43XinRb0pYyPVpF DkMQ== 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=tHZpbOkOPbB4YfGP7cAJTkfgI4hLNkpCt2R42P0N7C0=; b=NX7IuvPefebWRQEneXd4m95a2DVGPFSgxuh1oq2zzjxazjbKXg6za32oKesfEyuWS7 G6GuLZ5yfX5oOMsa/A6CBvyjo+VuLAB2rB/BaFXDGt42qjsRFIJf2l4xkJIDrvWSFg0r JOA8KXX5f76N9WX9GlDd3jRpC1bxMJReePjyPn8/eTtwkPmQJVSjdHAPQe6DMCQFK+Zz 5nz+WvoiMmmpkaLQcKEhyfW/solcfNGQO0yeHYuJWKkAplllDQHanlPBxN9xtEekS+7N LVtF6a6wbZuiPGfaKZSoARvZfPi5y4SO5BFubiZ2gI8QaRC3OQ3F5QHrpyq7FOstAbMG dN4Q== 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 qk10-20020a1709077f8a00b007ae8d01144dsi4660300ejc.717.2022.11.18.17.09.59; Fri, 18 Nov 2022 17:10:20 -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 S235872AbiKSAha (ORCPT + 91 others); Fri, 18 Nov 2022 19:37:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236001AbiKSAgq (ORCPT ); Fri, 18 Nov 2022 19:36:46 -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 8E3FF52152 for ; Fri, 18 Nov 2022 15:43:28 -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 1owA9E-000422-LC; Fri, 18 Nov 2022 23:47:48 +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 1owA9C-0058g9-IE; Fri, 18 Nov 2022 23:47:47 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9B-0000Kb-KC; Fri, 18 Nov 2022 23:47:45 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Support Opensource , 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 428/606] mfd: da9062-core: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:42:42 +0100 Message-Id: <20221118224540.619276-429-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=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 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/da9062-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c index a26e473507c7..40cde51e5719 100644 --- a/drivers/mfd/da9062-core.c +++ b/drivers/mfd/da9062-core.c @@ -621,9 +621,9 @@ static const struct of_device_id da9062_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, da9062_dt_ids); -static int da9062_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int da9062_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct da9062 *chip; unsigned int irq_base; const struct mfd_cell *cell; @@ -744,7 +744,7 @@ static struct i2c_driver da9062_i2c_driver = { .name = "da9062", .of_match_table = da9062_dt_ids, }, - .probe = da9062_i2c_probe, + .probe_new = da9062_i2c_probe, .remove = da9062_i2c_remove, .id_table = da9062_i2c_id, }; -- 2.38.1