From patchwork Fri Nov 18 22:40:18 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: 23117 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp488086wrr; Fri, 18 Nov 2022 16:44:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf5UIGm5YAqUKO0+EvOufyoF6kG0LTFyV2hON1TR6oG50Hd/GtFqXkTn7KyocWbfoMxSlttj X-Received: by 2002:a17:906:f81:b0:78d:8dfb:10ad with SMTP id q1-20020a1709060f8100b0078d8dfb10admr8257751ejj.289.1668818616567; Fri, 18 Nov 2022 16:43:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818616; cv=none; d=google.com; s=arc-20160816; b=opd1yl3PuZ5K5+6Jqugy26e6ktRYN590UQ/bgTd+iJcVrBw9LwT9VMHuIVgJ7PZh/e RTOknaouWbWT4kyXus8UnICPqY0EEbEiO8ZkadN6hcI5ImDcxvwFyEPKTkXs7dhNyo1D 1GCdgKYkzTI7HbtiN0SFdy0qcA29leM0PL8lQ7V4OfGfsqNIDY3pGMnVdsz9hy4wCjcn NCH/FHmeXR59CUwmIIbNt4eSubGI75Oi84kCoLf94Wt0axJmzAGy+gn6u6yd07av8LgL 8j4XgAXXltwtd2ur3HXUHzgf7cnhOUBTxl/OemnLpPtg9AnRC8oHpFLf5zch1DldUlXJ upkQ== 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=tuVnYtHH5mqQcknFzngtKOBH9NnSXllPmIQkzIbb04Y=; b=HvMUnBGPQfAF40I2zCdpkff0884PEfmUX9spiESxvWAA9N9pAOV1rj8DsenhoBG5l0 WTtVMjklYoeA1D+8tQdyw8U8dks1nH8vsrX5F1KYqQQswYe08w8XQNPQa+7cJxNrvZ0u Nc7iO09uktTbeYeqxC2JmYWQtDcUvVjfk8YksX/ERw8DdZGzoAzfJDkkecgdC1pfnW1v qcrVI+6dwyjjiLVu//ZrbDr/1GCcVzA7aZgoubYbEK7NaP/3i4JHr3SZAGJETrxmPkpm wE6MJ/EfWfMGyxR3CoOdsTC6VF26Z899jGFTm7uIrc0m9WFDsEDKvaF7j/eUUSEYxY4A cBOg== 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 dn8-20020a17090794c800b0078db6f488c2si4581250ejc.56.2022.11.18.16.43.05; Fri, 18 Nov 2022 16:43:36 -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 S235737AbiKSAfr (ORCPT + 99 others); Fri, 18 Nov 2022 19:35:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234130AbiKSAfP (ORCPT ); Fri, 18 Nov 2022 19:35:15 -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 0DFBA8C4B8 for ; Fri, 18 Nov 2022 15:43:07 -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 1owA8h-0002bn-Da; Fri, 18 Nov 2022 23:47:15 +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 1owA8e-0058US-6Z; Fri, 18 Nov 2022 23:47:13 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA8e-0000A7-9t; Fri, 18 Nov 2022 23:47:12 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Riku Voipio , Pavel Machek Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 284/606] leds: pca9532: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:40:18 +0100 Message-Id: <20221118224540.619276-285-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?1749883149756653583?= X-GMAIL-MSGID: =?utf-8?q?1749883149756653583?= 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/leds/leds-pca9532.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c index df83d97cb479..15b1acfa442e 100644 --- a/drivers/leds/leds-pca9532.c +++ b/drivers/leds/leds-pca9532.c @@ -50,8 +50,7 @@ struct pca9532_data { u8 psc[2]; }; -static int pca9532_probe(struct i2c_client *client, - const struct i2c_device_id *id); +static int pca9532_probe(struct i2c_client *client); static void pca9532_remove(struct i2c_client *client); enum { @@ -103,7 +102,7 @@ static struct i2c_driver pca9532_driver = { .name = "leds-pca953x", .of_match_table = of_match_ptr(of_pca9532_leds_match), }, - .probe = pca9532_probe, + .probe_new = pca9532_probe, .remove = pca9532_remove, .id_table = pca9532_id, }; @@ -504,9 +503,9 @@ pca9532_of_populate_pdata(struct device *dev, struct device_node *np) return pdata; } -static int pca9532_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int pca9532_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); int devid; struct pca9532_data *data = i2c_get_clientdata(client); struct pca9532_platform_data *pca9532_pdata =