From patchwork Fri Nov 18 22:36:31 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: 22591 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp448236wrr; Fri, 18 Nov 2022 14:51:43 -0800 (PST) X-Google-Smtp-Source: AA0mqf60oEnit+Y4bTtHqYYqlej7c6dyUM88SCHJ6r+8B0lA6l15kCyFf0AY2EsRhLf/+BvPIHRr X-Received: by 2002:a63:4708:0:b0:461:4039:88d1 with SMTP id u8-20020a634708000000b00461403988d1mr8246822pga.568.1668811903555; Fri, 18 Nov 2022 14:51:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668811903; cv=none; d=google.com; s=arc-20160816; b=N31eJ0T95egB//PI7yjLCynH2gM28AeUIj42U3XU1l3/fVSaa7wRjoQbPT9fT5xhyF RcC8cbX4expmxe9gsSSJwO8uLFJhRI/ulxm3Pn/wuZ80Ai3LrVF+aJ7BW/6YdH1XND2Q XlxMWiiwgimXU++TvJq4MJmf1vL5mpONh5fwmXet3+c+bpZb0gJwV8NcuLbU38hCqI0L 0jujMbJ7LqS+kzeLg/qY9ucfQdkkUX99gar1YuqKhaDJMJPPg6hzBfIHD/pBo91f6FVE ZdSKGT1+1L9ywi2f8T2gdGPaMwzEyCkAOr55qHFqE6JUDj8moVEfG2pCnMjTW3cEazEu +sjA== 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=t8CVsNyuYO74K6pq56rlQvNLaocdKmYPyyvAt+owVsg=; b=O91QD73ieRXkKkoAh+HRKdRrLfVTyZnJSBnaBjfj0POJMur7sK+y5SHfAn0ul2LLpn 74gFJPPhdZlEUo6WXm5B6ZvmFYba5da7K1TSsKmBIEopZj8da3RqiC3dz4v2SzXovjEr KOwV4/4F5IcYs97inXHvgN3DaTWgQ1NmNXY4DMaSe0nnKu6+Y0z/9ZMR502LJwGW1tAw l0MZcBlFR54FkzGLUSWWxZqhDRP6OFWaEutg932ee1Dp5HB473KKHkfaXbJ+IomX+yV9 VCepxPeoXWattJ2bxgVOo8zxjI7wIeTQeahrwAuT1tzElkwSzh4mh6zNpJphPOczIZ7O 2ZzA== 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 f9-20020a63f749000000b0046004f18c6csi4906665pgk.456.2022.11.18.14.51.30; Fri, 18 Nov 2022 14:51:43 -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 S233875AbiKRWur (ORCPT + 99 others); Fri, 18 Nov 2022 17:50:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232851AbiKRWrq (ORCPT ); Fri, 18 Nov 2022 17:47:46 -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 39A9BA288E for ; Fri, 18 Nov 2022 14:46:48 -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 1owA7r-0007wb-FG; Fri, 18 Nov 2022 23:46:23 +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 1owA7o-0058CA-FT; Fri, 18 Nov 2022 23:46:21 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA7n-00HayU-DN; Fri, 18 Nov 2022 23:46:19 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Jonathan Cameron , Andy Shevchenko , =?utf-8?q?Marek_Beh?= =?utf-8?q?=C3=BAn?= , Crt Mori , Miaoqian Lin 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 057/606] iio: accel: mma9551: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:36:31 +0100 Message-Id: <20221118224540.619276-58-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?1749876110831384232?= X-GMAIL-MSGID: =?utf-8?q?1749876110831384232?= 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/accel/mma9551.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c index f7a793f4a8e3..aa4f5842859e 100644 --- a/drivers/iio/accel/mma9551.c +++ b/drivers/iio/accel/mma9551.c @@ -446,9 +446,9 @@ static const char *mma9551_match_acpi_device(struct device *dev) return dev_name(dev); } -static int mma9551_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int mma9551_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct mma9551_data *data; struct iio_dev *indio_dev; const char *name = NULL; @@ -607,7 +607,7 @@ static struct i2c_driver mma9551_driver = { .acpi_match_table = ACPI_PTR(mma9551_acpi_match), .pm = pm_ptr(&mma9551_pm_ops), }, - .probe = mma9551_probe, + .probe_new = mma9551_probe, .remove = mma9551_remove, .id_table = mma9551_id, };