From patchwork Fri Nov 18 22:40:23 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: 23040 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp484669wrr; Fri, 18 Nov 2022 16:34:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf41U2MV2luzpXy9H4u91Fc7DK+EKaLxXgUqFHVtWyFipSDLuRSllYos0/uMl1Zk/axVDdwx X-Received: by 2002:aa7:d358:0:b0:467:6847:1ea7 with SMTP id m24-20020aa7d358000000b0046768471ea7mr8115660edr.237.1668818044515; Fri, 18 Nov 2022 16:34:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818044; cv=none; d=google.com; s=arc-20160816; b=f3Rc8WMAjkyQGrJN/ji1mMVV12WDo6wM8lBNkdffI8m9mjQdsOegTlEHCN0vZOyKmz QHxxzNRMhliz9OV4neKqoai2/IY7hqKdyRno2y7G2IMqTkmxTQrmHCuMuRcJIo7KlUas fvZCX+Gt0oaYawKwqJJIBZPRLwsPbtMAiVthRfOHeYBFCK6L8mOf9hJ+kX1mqWYxe+QX AykBBsaUrImmFBG2s5cAFoxIeaiVpKgZ5/QOZkMIEpRccr2E649tOFnbmiJ8Dp6gWl+6 xlF22c/kLKuhoZ1xDPvCTEqBsqFviOw+W9urhzUKbUodheQujF4M9fV4VOrFMNxmX+8R rrFw== 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=jIza/JiEbIgiuo0juW0aRSKBN7E635TDcKPNMd3yb2A=; b=x6MIvY0vm0n7gN43cNCASvmRYJyjN/lRBIWJ/Z1EjqhVN4qR1hU3UhQn2cwBwG0T3v yEkN0FCGFOD1ph08rTDf+tO9Na+R1c14VIU/2Z69D+CADPcbCfSHBvdevb0rox0i9K+3 wx2e35O+i1YAS7QgT9diOpbq5RL/lm5Q+JWglYSwqtvnof0L737D5ou1nUVVzabgalzA Da3rfpkyekxjwLWwBAT0m8ZywHG5NaZVfnTi8rj0fcitxF+j4AqT7BdjBr7wsi4ZkM8X Z7N535X4ni4lsUGdkRWb7cOVJ0QGWOwCDRPJ7I3Zp45nKY55IuSwalPpDnIN5RZIla/L A3oQ== 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 pj17-20020a170906d79100b007a45e4f4ff0si982971ejb.885.2022.11.18.16.33.36; Fri, 18 Nov 2022 16:34:04 -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 S237846AbiKSATh (ORCPT + 99 others); Fri, 18 Nov 2022 19:19:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237839AbiKSATI (ORCPT ); Fri, 18 Nov 2022 19:19:08 -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 A1FA1FC702 for ; Fri, 18 Nov 2022 15:36:14 -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 1owA8n-0002eo-9u; Fri, 18 Nov 2022 23:47:21 +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 1owA8f-0058Up-Cw; Fri, 18 Nov 2022 23:47:14 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA8f-0000AS-GR; Fri, 18 Nov 2022 23:47:13 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Benjamin Herrenschmidt , Michael Ellerman , Christophe Leroy , Dmitry Torokhov , Minghao Chi Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH 289/606] macintosh: ams/ams-i2c: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:40:23 +0100 Message-Id: <20221118224540.619276-290-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?1749882550221304210?= X-GMAIL-MSGID: =?utf-8?q?1749882550221304210?= From: Uwe Kleine-König The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König --- drivers/macintosh/ams/ams-i2c.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/macintosh/ams/ams-i2c.c b/drivers/macintosh/ams/ams-i2c.c index 3ded340699fb..a4a1035eb412 100644 --- a/drivers/macintosh/ams/ams-i2c.c +++ b/drivers/macintosh/ams/ams-i2c.c @@ -56,8 +56,7 @@ enum ams_i2c_cmd { AMS_CMD_START, }; -static int ams_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id); +static int ams_i2c_probe(struct i2c_client *client); static void ams_i2c_remove(struct i2c_client *client); static const struct i2c_device_id ams_id[] = { @@ -70,7 +69,7 @@ static struct i2c_driver ams_i2c_driver = { .driver = { .name = "ams", }, - .probe = ams_i2c_probe, + .probe_new = ams_i2c_probe, .remove = ams_i2c_remove, .id_table = ams_id, }; @@ -155,8 +154,7 @@ static void ams_i2c_get_xyz(s8 *x, s8 *y, s8 *z) *z = ams_i2c_read(AMS_DATAZ); } -static int ams_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ams_i2c_probe(struct i2c_client *client) { int vmaj, vmin; int result;