From patchwork Fri Nov 18 22:42:40 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: 22689 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp462381wrr; Fri, 18 Nov 2022 15:30:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Uhpj8PoMYm+iLB6XojQrEIozpsVXUMVuGCDY9gll2127CmBq8JBfxrtRZcAd6zWeINJk9 X-Received: by 2002:aa7:cc99:0:b0:44e:cd80:843b with SMTP id p25-20020aa7cc99000000b0044ecd80843bmr7959405edt.126.1668814201438; Fri, 18 Nov 2022 15:30:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668814201; cv=none; d=google.com; s=arc-20160816; b=GzuhlmTzcCVSAdMdvs9o8zmPkShGGgO0HNdFBYdzPPEbnWo/sAg3BRWCFHWDX1bz8+ BA6zevyWhvjHrwCc+bv1/d+6caIRq/z9BErLoOaAcGAAoKJI0AE/POR2BUmj8RbwJf/W lxligfZ3xoJuiKMTEzrwJUemVegdE2o2rExt0LS+b0dZTW+coytgdtZAQQtjHcn4RfDE a7QGdRleYFc0TOTcaqGgDCthcK5gUYsIj6E3Y/bIyC6s9hFW8mnp/cGLMxMAkiztfi1t ok1SFGpEkFFyFir2vOD/1H1IVQ8kuXlTU9VyIFiJNs2WQGgOqIlkKQjZnAbtYMHdSpcT P7GQ== 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=ke9PytmrycPg6xIBjQzwz5ES8nVaDjzDApKGNjWjwCM=; b=kYrNqVoAglSmg4Elg1EIblxjZ6YItDEwo3AIUFgVp7kuXlzRyXqalS+LsiIgyff8DE IycAgkjxv5X0bg6mfL4C088hZ4PfHKFEPNbZe+omPa0OExxZM3O0PUSJX/bUfmxHgIQs zXPWZ/wmAwdPcNVZyMGTSTKpHJjr5szydZxO7rGC3xXUJG4SAfP2+x3olDxOyurFf0P3 pJIVvRK5lBcWLOLISz0M6GQ5VTQx1yZxck4qRFZyl60cDjXGFMe1I18DClhl0l00sEuA veNPVIvdnR7termbiR1kBbmJa8A6qmT63Y1u4ZBFWlwgpjyX5ySc8MFXR4EjP3Bk8yLP L9OA== 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 gt12-20020a1709072d8c00b007825bd02a6asi4670019ejc.54.2022.11.18.15.29.37; Fri, 18 Nov 2022 15:30:01 -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 S232734AbiKRX3E (ORCPT + 99 others); Fri, 18 Nov 2022 18:29:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235741AbiKRX2Z (ORCPT ); Fri, 18 Nov 2022 18:28:25 -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 F22F87118C for ; Fri, 18 Nov 2022 15:16:20 -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-00041P-BB; 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-0058g5-BV; 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-0000KV-4G; Fri, 18 Nov 2022 23:47:45 +0100 From: =?utf-8?q?Uwe_Kleine-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_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-kernel@vger.kernel.org Subject: [PATCH 426/606] mfd: da9052-i2c: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:42:40 +0100 Message-Id: <20221118224540.619276-427-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?1749878520406891848?= X-GMAIL-MSGID: =?utf-8?q?1749878520406891848?= 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/da9052-i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c index 5a74696c8704..ecb8077cdaaf 100644 --- a/drivers/mfd/da9052-i2c.c +++ b/drivers/mfd/da9052-i2c.c @@ -126,9 +126,9 @@ static const struct of_device_id dialog_dt_ids[] = { }; #endif -static int da9052_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int da9052_i2c_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct da9052 *da9052; int ret; @@ -176,7 +176,7 @@ static void da9052_i2c_remove(struct i2c_client *client) } static struct i2c_driver da9052_i2c_driver = { - .probe = da9052_i2c_probe, + .probe_new = da9052_i2c_probe, .remove = da9052_i2c_remove, .id_table = da9052_i2c_id, .driver = {