From patchwork Fri Nov 18 22:44:28 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: 22975 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp476538wrr; Fri, 18 Nov 2022 16:09:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf4LZdSWCz3P+HlTRQMOfjjWUQipcjqGFu0g61fPfawWiD0kdXqQO8d/IsMdnFcmHTcH4rPK X-Received: by 2002:a17:90a:b011:b0:20a:97e2:5373 with SMTP id x17-20020a17090ab01100b0020a97e25373mr9888845pjq.200.1668816557663; Fri, 18 Nov 2022 16:09:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668816557; cv=none; d=google.com; s=arc-20160816; b=wc/baKUZWaBXZ+purPuOSaapO+ro9MXxsEmUF2sAljletxj3k8860cNcvjdb/iIcY3 lbimTeVWLwdXdZeEKeoD3dbixuFcTxz8OFm6K3Yu51dKem8dVzvYX2MIxk02QnXUFTKb W/mZMIhYFUCIBgDLRP3aOGGLDMKnbYcdEizhPGbY6JXbbAV6NV12zKb77N5wD+H7SmOx 8uobCQaGujcM9ZgW/cMWH4a65CELy8ZA2bthEK+Co2cWdxLWLj3tggdeNe4vkf3VExoh KXujxJQsoTbd7M8x9T/tmBrtbetayf4xV8Oe4ExEOa+dqN2oHWnEfuwmTvDO43Z/r8rb IV+Q== 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=gKwdhSp0UDizj4/5OY/+OEExWERtMsTxm9ghH8zjdyg=; b=ybbKewzHBIc+HPOn7eSBmX6Br2GWhe/Wke/7hoPlvEcLHmbt/nVzDOex/hJJ3v3eJn wpvHwhbinesddZC1QB7Svq5zw3FvpPgr+E9o7YY9NcUdp4i4SrvNMYRVIU5k680yjR8x rqZJ2PNXDJGkTNpftLbWti9lG32ckgeY0MN/exf0Ldm4rM44GQkCxxSO0XCqvY+hfucO dNfNE2AOy1tR60ipuYQ+tl3NPEG3fO4v4NCIdkAwOrdMEoYj24PL12322WfYAgt+PWZQ ccf5OC/gvzwHjJZxEjlCC1RDpsxKKkmQ4W1NnpW3y1RJAPCQj+IrzmXhICIykHW7Z8zm l7OQ== 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 u6-20020a170902b28600b00188ffe7f69fsi2444267plr.251.2022.11.18.16.09.04; Fri, 18 Nov 2022 16:09:17 -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 S237419AbiKSAEc (ORCPT + 99 others); Fri, 18 Nov 2022 19:04:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238040AbiKSADm (ORCPT ); Fri, 18 Nov 2022 19:03:42 -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 539F6E9160 for ; Fri, 18 Nov 2022 15:30:53 -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 1owA9Z-0004zc-W3; Fri, 18 Nov 2022 23:48:10 +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 1owA9X-0058ot-Hi; Fri, 18 Nov 2022 23:48:08 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9X-0000RX-0D; Fri, 18 Nov 2022 23:48:07 +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 534/606] power: supply: smb347: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:44:28 +0100 Message-Id: <20221118224540.619276-535-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?1749880990799242680?= X-GMAIL-MSGID: =?utf-8?q?1749880990799242680?= 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/smb347-charger.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/power/supply/smb347-charger.c b/drivers/power/supply/smb347-charger.c index 996a82f8a2a1..b5f038310282 100644 --- a/drivers/power/supply/smb347-charger.c +++ b/drivers/power/supply/smb347-charger.c @@ -1528,9 +1528,9 @@ static const struct regulator_desc smb347_usb_vbus_regulator_desc = { .n_voltages = 1, }; -static int smb347_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int smb347_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct power_supply_config mains_usb_cfg = {}; struct regulator_config usb_rdev_cfg = {}; struct device *dev = &client->dev; @@ -1629,7 +1629,7 @@ static struct i2c_driver smb347_driver = { .name = "smb347", .of_match_table = smb3xx_of_match, }, - .probe = smb347_probe, + .probe_new = smb347_probe, .remove = smb347_remove, .shutdown = smb347_shutdown, .id_table = smb347_id,