From patchwork Fri Nov 18 22:44:27 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: 22908 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp472847wrr; Fri, 18 Nov 2022 16:01:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf6x+G/Q8FrXM9GXphV6lJXlIu0NPLh7FXbyZLCr4+5QhUvZaQiTneTH7moG9wCE3SXwdYSK X-Received: by 2002:a17:90a:e60f:b0:218:95b9:f2f7 with SMTP id j15-20020a17090ae60f00b0021895b9f2f7mr1661918pjy.131.1668816061087; Fri, 18 Nov 2022 16:01:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668816061; cv=none; d=google.com; s=arc-20160816; b=iqOWY+UUT6E0eKddPvtyiKdTMH+uqEZueYip8Q24LslvenoxeycBcZgp9hwlh149Ji MNJ29KSYOcU7CVDFZOjSQ2nRc6PtIzH1Xr1saJcRvgVaYnJYNi2Qb01Ew4lBDafYo45N RYIdDtrVmw5ko9gpsbuNQirZ/qmLK2eTTy+PfC0SG+IfNzhD0PE42p8fiGQbeZ0z0CKj +6nStD60T6MvHDWvg0mwDyM3Rl1qKNqq/QOVpUF2FJJ6m7kCfId6uD9U0T/8gyeiL44X 2/CzlsvvNXh399R4F9Z1ieOcO2b5CxSDCHLnLXimoW1SMQeVVhqncnkeSgld+E4BNkuS nrIQ== 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=vrpL71U4Mmcg4QzDalVskqmxhJ8khANqIpi0ew73CRA=; b=McJUk9CMvLD6NDhkC64EMyjAWHL6xuDZkXLolhSkFD1Iu6idZmYCUsBZGy/XZbBH68 ho3hYELjvqy+eYFZmi4fN1VZPNFokOv+TyTbbs/zeGkCI6rtU1YTGbWu11QzOMzrBHjU IQKGUalrLPBN7pw7zb0GyrFacVsVI9TkAsZa9zv7PcbFmSIFqCvzUhVZfifYUelj9Qxt K9vCxF0wwJSnws8q8rDLg/CSqY5jqBLUANUoJx6GjIIy+F3b6uqsc/5TDRDjoO1tUyyF eoTshUXbapfFl9cU++T43qu2Y2g/oh2C987lqz6Kf8LSm/JKzFnCyZO6ltsAJ59zd1cH qoMw== 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 m18-20020a170902f21200b00186a43ad5d0si4386653plc.604.2022.11.18.16.00.46; Fri, 18 Nov 2022 16:01: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 S234642AbiKRXzz (ORCPT + 99 others); Fri, 18 Nov 2022 18:55:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235608AbiKRXyW (ORCPT ); Fri, 18 Nov 2022 18:54:22 -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 B4BFACB68C for ; Fri, 18 Nov 2022 15:27:54 -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-0004yb-RH; Fri, 18 Nov 2022 23:48:09 +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-0058oh-4L; 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 1owA9W-0000RT-QW; Fri, 18 Nov 2022 23:48:06 +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 533/606] power: supply: sbs-manager: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:44:27 +0100 Message-Id: <20221118224540.619276-534-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?1749880469909150610?= X-GMAIL-MSGID: =?utf-8?q?1749880469909150610?= 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/sbs-manager.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/power/supply/sbs-manager.c b/drivers/power/supply/sbs-manager.c index 71ec8f74f835..bde977391fd4 100644 --- a/drivers/power/supply/sbs-manager.c +++ b/drivers/power/supply/sbs-manager.c @@ -315,9 +315,9 @@ static void sbsm_del_mux_adapter(void *data) i2c_mux_del_adapters(sbsm->muxc); } -static int sbsm_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int sbsm_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct i2c_adapter *adapter = client->adapter; struct sbsm_data *data; struct device *dev = &client->dev; @@ -409,7 +409,7 @@ static struct i2c_driver sbsm_driver = { .name = "sbsm", .of_match_table = of_match_ptr(sbsm_dt_ids), }, - .probe = sbsm_probe, + .probe_new = sbsm_probe, .alert = sbsm_alert, .id_table = sbsm_ids };