From patchwork Fri Nov 18 22:45:05 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: 23100 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp487631wrr; Fri, 18 Nov 2022 16:43:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf6CtV5KT/1kUJSkivgLPjSaUrRUPrJ92V/mwWcvWZLmE2GE8VGWYPyYa5x8aCr3KM+K7tbD X-Received: by 2002:aa7:cc14:0:b0:468:58d4:a10e with SMTP id q20-20020aa7cc14000000b0046858d4a10emr8361087edt.222.1668818615941; Fri, 18 Nov 2022 16:43:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668818615; cv=none; d=google.com; s=arc-20160816; b=ZhduaFo0JPLtRJu2fk2SzGyY5E6fgWkWjvVWxCYGFOBESZ0Uo/T6OkfjvOs+iSYlcb SDrMcZOB0S7cvHcyKhRsx7GOtAjr0Dp8hSMd16A7x0hkD8/0vGvccdq/fozNKYrEhVBT faEYppP9dXK0ZFO8dHQs1ZU3HOZI6abrepG9355k6gVKw7Y6bjStyyB0zYC00TAI/s3o vM/wZ/4n5SW1hhmMARA3KgRhp3dxuxlqz6gfjAvPJKOb/4pgsNRz12j2K9lllddYCz+D iP/S3Jg+34RV/vEUMstiIWFsZBPgUHVwUkNAfLfnELkGoCZJv//urB0CspYHJgsYWRt3 85Gw== 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=0h+GPv8j8Y3DlZBl6u+2uw46VBRng1/kSn3F+NppSRU=; b=hmnQtEnDs4FmAZhZc4jM254G3AcK/PhnIoxB1zM1Rzj9dAUcfSCz9S3z+ufM4jQQfY 6CRFBr2MvJvMTBBevND+pWQAmgGnFKuqJaD9y7RVnpQ0/ueTarTM/ptnHjNMD8bMkSrG O1fOTq3T5XnwpkMuzZMb4/tr8nQpPYEVB+8l84h9CtmFZu0uwdrbRWY6gctVf/Um5UvP PZPVf/FH7VV20m2Q5bpDGKQFsyC0nzz6XXbHKmn6KNijmcv+cqsL89K0ygm+UmTLxJcg y5EgrW9oaJtZ0qzyUp1K9hlMVMcbywEQuyVGXsGLqe0XABlvWCe4Wm5w+RAyaz4ruG71 BXeA== 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 oz36-20020a1709077da400b007b2a8df055csi3678418ejc.217.2022.11.18.16.43.05; Fri, 18 Nov 2022 16:43:35 -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 S236619AbiKSAkS (ORCPT + 99 others); Fri, 18 Nov 2022 19:40:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235692AbiKSAjI (ORCPT ); Fri, 18 Nov 2022 19:39: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 EBFBAC78EA for ; Fri, 18 Nov 2022 15:44:23 -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 1owA9h-0005GQ-GO; Fri, 18 Nov 2022 23:48:17 +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 1owA9e-0058rl-B2; Fri, 18 Nov 2022 23:48:15 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9d-0000Ty-Sg; Fri, 18 Nov 2022 23:48:13 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Greg Kroah-Hartman , Jiri Slaby Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 571/606] serial: sc16is7xx: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:45:05 +0100 Message-Id: <20221118224540.619276-572-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?1749883148959143262?= X-GMAIL-MSGID: =?utf-8?q?1749883148959143262?= 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 Reviewed-by: Greg Kroah-Hartman --- drivers/tty/serial/sc16is7xx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 39f92eb1e698..8412b25eac86 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1665,9 +1665,9 @@ MODULE_ALIAS("spi:sc16is7xx"); #endif #ifdef CONFIG_SERIAL_SC16IS7XX_I2C -static int sc16is7xx_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int sc16is7xx_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); const struct sc16is7xx_devtype *devtype; struct regmap *regmap; @@ -1708,7 +1708,7 @@ static struct i2c_driver sc16is7xx_i2c_uart_driver = { .name = SC16IS7XX_NAME, .of_match_table = sc16is7xx_dt_ids, }, - .probe = sc16is7xx_i2c_probe, + .probe_new = sc16is7xx_i2c_probe, .remove = sc16is7xx_i2c_remove, .id_table = sc16is7xx_i2c_id_table, };