From patchwork Fri Nov 18 22:37:34 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: 22950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp474906wrr; Fri, 18 Nov 2022 16:05:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf6gUdMEhoCFUZkZqLbheHF9Eq46Rq5oakZPPbNVAi0UkQzAoHndROcj/UT4oENVWhBhpkPR X-Received: by 2002:a17:907:c314:b0:78c:2b55:59be with SMTP id tl20-20020a170907c31400b0078c2b5559bemr7950125ejc.2.1668816314893; Fri, 18 Nov 2022 16:05:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668816314; cv=none; d=google.com; s=arc-20160816; b=hMWSEqTqZGVKaA18B/bSEwNQNo1gctzp/chMJP+81Ak6Mj/NHd3ELJNlVxbt8j+wDT 6w8iZ9d0trrM3BAeXYHaozh3FKwsXecjnZH1M21z7xr1cw8EF5a0Q/CT29amU5cuIKYc 6Lxx9KTW/BTXZUH5rM/msKcw59LSnq52FkOuMrECB3BvJ4PKIhSyte0J4Bu3LR9DKABp LZGLSaKEgBNigaCUyCTBoPbKCN+gKpaG4GkDRim+FkGAGM9bVyvRU5ww1qAQIVFRtU0R LxkqrVLreTw5MhxIWK4pUO/VUzQ6WQ2b+Ov7quz0lH4zKL7wSfqvon6GrAnEycwAXNI6 ybcA== 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=NX5ytjqScHPycucGB05Z9pEnqLwJ5KsDv19Qm1yUz+8=; b=oLsDt2iw+jvJLHuWE2PJqMxQ2OP9TaSOH/XG6rssCbOCDabvNj/gvU0ULvRp1AYZOM t4yNotdFwQGro5WjuEjvvPyffffvbisMQcSDRYxPmiZcSrp+Jzoa1zkXbhMvsEALJhR2 W6cPw5/eJYP/o6Get9iBc5TRbShmKDOHgArzOQFI/9WbneeMFd7I4a72h3oR4TzkcFO1 7qGVBSxmbEmn3sNVednkBS1QUyIf2fzFv29CpAQPaEjLt2EdyeJfAr9xAUTP3XxUGNYg iXsHIO8s4RXl66UfX68V6cuEvJ0mRq4w7XtW/57pk47awoeRpsZmzQl3KHZd6Uk+yoYi 3/8w== 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 w19-20020a056402269300b00468f6721335si4149370edd.60.2022.11.18.16.04.45; Fri, 18 Nov 2022 16:05:14 -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 S237248AbiKSAAx (ORCPT + 99 others); Fri, 18 Nov 2022 19:00:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237226AbiKRX5J (ORCPT ); Fri, 18 Nov 2022 18:57:09 -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 AB325AF0A5 for ; Fri, 18 Nov 2022 15:28: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 1owA85-0000Tu-TZ; Fri, 18 Nov 2022 23:46:37 +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 1owA81-0058Gx-8R; Fri, 18 Nov 2022 23:46:34 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA81-00Hb2d-FE; Fri, 18 Nov 2022 23:46:33 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Kevin Tsai , Jonathan Cameron Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , Lars-Peter Clausen , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 120/606] iio: light: cm3232: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:37:34 +0100 Message-Id: <20221118224540.619276-121-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?1749880736600349003?= X-GMAIL-MSGID: =?utf-8?q?1749880736600349003?= 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/iio/light/cm3232.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/light/cm3232.c b/drivers/iio/light/cm3232.c index 5214cd014cf8..43e492f5051d 100644 --- a/drivers/iio/light/cm3232.c +++ b/drivers/iio/light/cm3232.c @@ -325,9 +325,9 @@ static const struct iio_info cm3232_info = { .attrs = &cm3232_attribute_group, }; -static int cm3232_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int cm3232_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct cm3232_chip *chip; struct iio_dev *indio_dev; int ret; @@ -417,7 +417,7 @@ static struct i2c_driver cm3232_driver = { .pm = pm_sleep_ptr(&cm3232_pm_ops), }, .id_table = cm3232_id, - .probe = cm3232_probe, + .probe_new = cm3232_probe, .remove = cm3232_remove, };