From patchwork Fri Nov 18 22:44:10 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: 23033 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp480012wrr; Fri, 18 Nov 2022 16:18:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf4XTVehBAAm6l60+mT2Znhj7mI5EK97dWWxKSSNaIAO5mMO+9za+Rq5eq3Ye3ul5K597lFp X-Received: by 2002:a17:906:8419:b0:7a3:28c7:5835 with SMTP id n25-20020a170906841900b007a328c75835mr8278298ejx.32.1668817138687; Fri, 18 Nov 2022 16:18:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668817138; cv=none; d=google.com; s=arc-20160816; b=zMvf4iSAzTOYlSown4p7JqaXHA6ikpIAAzJGBOf3kBuQ2+qSitXNqXKxKU9zr+11Sk B4r1ZCHQxMhu+lgPLft+Xj6wJ0//BZbaQbwnleRiKTOr5g5mwQD8QAb/qjrHVH8PmyPj GMuxaGcmwVTW2KD4XuG2frHIzZj3gTSGtkwYxA/wE99+7/m/pDDQ8qsCZ4oXa4+HuMr+ 6ctnhvfis1Oy70f5mE1J6brdQRYauRRvVAa9rVayAPKCp/q7+bEdDNG7owEpY+dXmarE WWkZYEbzPjThzh3bSyokSRhke0Z2Vtd1zg1r7xEC4/uPj1Radc5oVE70brGLMhHve9kb SeCw== 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=6ZAVN6tQs+HhCLaO83wzDcZA72RX5zXKAGbqY8ylpc0=; b=I68ayEtKr7eayHlIunbRLJI/x3BoBquf7wjPV2VkyEcaFO6UsYsnw1MbEob2hgH1hg YOf9/oLwn2iQhgv44vmKuS3cNsqynHtMNiA6bBlF6/bE9KE8ovCwEmx5oFHx3uhVq2Tw RY5tBAhstJBhhRqRBc6wTEjRoWb/n2VMYhN61SRx1WZVnJLocd9RCOD686PYK36Q/cHl oSH0Ug2H1omaYKUQtI0Ui4oNH6KXzBnInNJopNpnmtcfCCMLaQPg+7dodpdVMykIDOEO 4Ij/sPtY8T5mLDSFMGoInx0RgcS48amlOzqo5egVgTBcOfVzYlM3DwwV7VG23lw+vew7 RqJg== 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 g14-20020a1709065d0e00b007ae9abf1990si4696966ejt.352.2022.11.18.16.18.35; Fri, 18 Nov 2022 16:18:58 -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 S231925AbiKSAQP (ORCPT + 99 others); Fri, 18 Nov 2022 19:16:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237846AbiKSAPs (ORCPT ); Fri, 18 Nov 2022 19:15:48 -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 86AAEF7348 for ; Fri, 18 Nov 2022 15:35:14 -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 1owA9V-0004mo-Go; Fri, 18 Nov 2022 23:48:05 +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 1owA9S-0058n9-Sm; Fri, 18 Nov 2022 23:48:03 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9S-0000QL-S4; Fri, 18 Nov 2022 23:48:02 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Sebastian Reichel Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 516/606] power: supply: bq24257: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:44:10 +0100 Message-Id: <20221118224540.619276-517-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?1749881599546901400?= X-GMAIL-MSGID: =?utf-8?q?1749881599546901400?= 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/power/supply/bq24257_charger.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/power/supply/bq24257_charger.c b/drivers/power/supply/bq24257_charger.c index a309bbedfe52..ab4c49788c58 100644 --- a/drivers/power/supply/bq24257_charger.c +++ b/drivers/power/supply/bq24257_charger.c @@ -947,9 +947,9 @@ static int bq24257_fw_probe(struct bq24257_device *bq) return 0; } -static int bq24257_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int bq24257_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct i2c_adapter *adapter = client->adapter; struct device *dev = &client->dev; const struct acpi_device_id *acpi_id; @@ -1167,7 +1167,7 @@ static struct i2c_driver bq24257_driver = { .acpi_match_table = ACPI_PTR(bq24257_acpi_match), .pm = &bq24257_pm, }, - .probe = bq24257_probe, + .probe_new = bq24257_probe, .remove = bq24257_remove, .id_table = bq24257_i2c_ids, };