From patchwork Fri Feb 24 12:05:54 2023 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: 61289 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp868796wrd; Fri, 24 Feb 2023 04:11:10 -0800 (PST) X-Google-Smtp-Source: AK7set/ec0UVsCMVNy6PjQxcw/Db+ehXmvMHZCyeM1++rC1k8aIM7M9FQ35TWENKxw0ZfB0p546Z X-Received: by 2002:a05:6a20:6909:b0:cc:3f87:a80c with SMTP id q9-20020a056a20690900b000cc3f87a80cmr6757544pzj.3.1677240670531; Fri, 24 Feb 2023 04:11:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677240670; cv=none; d=google.com; s=arc-20160816; b=PwC3vWE9uyrU1hoASq9VjA8sWYFIndGXHNUiXVUwEtFTSYCiuUvclyfBRaNzLWIjBk tlKy4zqRAJ5gfFHGJrAPmwC9OVlgzw82c6zxICyucm/LUIpmdSbKLfNVqWxvxy+zyM+p pAu+TlV/cNw7WHXYoxK1hWGVfU0/wcNibPbLOyLUXvR+Pwrm/XQc4UmWnBuqmaL/VWxk Nc0aU6CybzUrZik63k2RItl8qMNVpcTr8hDMupQpi+WEoJK9xA4iVWnDEKh3hkcYhtie m2kxvgd4qEevSQfLDpJ7Ynw3QqHBowbRR4sQgqPht2hODd7/P5jgauLNWFxeDvgchKsV zebw== 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=mt2u1FYPGaTOHQre6H/7LkP9DwGgBr9kVIzuCi21Xgc=; b=ecCB7QBEy7NkKfCtLjR3vHcUNwwX2wQ/d+Swdf1TSmY0Hm4ZcgA/4b+3GKaTyT1y/m v7rScfyG5TPyTC994xizOGyq2sDcChuHBY4t++UWUn96KxCfhIX9LiFZwoyVyEImgrij 48Z+x0IjseaVu0E7b7kYr40X/LMdmh+8+P4ZCKrxzw+EocMRjTXde6Go7RbyaqFqMgvl HtTIznn+leGxLmuWkbwMGV8+GoRAwlOdOoFHbUMIYPcAm/gxziuR51XEbf9EAL0zAkjo 8B+KRi1iIHisx3WIGmQN3SVjBDSj8s63VLChWI8Vki7cfgfNc+3AUKTr+fx4h3LeY4DY k7oQ== 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 g8-20020a631108000000b005030e22ea14si1276813pgl.136.2023.02.24.04.10.55; Fri, 24 Feb 2023 04:11:10 -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 S229978AbjBXMG1 (ORCPT + 99 others); Fri, 24 Feb 2023 07:06:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229911AbjBXMGU (ORCPT ); Fri, 24 Feb 2023 07:06:20 -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 DE57E658CA for ; Fri, 24 Feb 2023 04:06:18 -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 1pVWq3-0000cP-GQ; Fri, 24 Feb 2023 13:06:11 +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 1pVWq1-007Azd-Fh; Fri, 24 Feb 2023 13:06:10 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pVWq1-006EYq-Vw; Fri, 24 Feb 2023 13:06:10 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Wolfram Sang Cc: kernel@pengutronix.de, Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/9] serial: sc16is7xx: Convert to i2c's .probe_new() Date: Fri, 24 Feb 2023 13:05:54 +0100 Message-Id: <20230224120600.1681685-4-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> References: <20230224120600.1681685-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1343; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=SyAwunV7rOOAWji/gEzYK8mQViHExwViHtm1Rqv0acA=; b=owGbwMvMwMV48I9IxdpTbzgZT6slMST/WMHb1X2gbKvcdZ6VfKrZwUmzDjDdX5TFkF6Q9FNeY E5UhdaDTkZjFgZGLgZZMUWWuiItsQkSa/7blSzhhhnEygQyhYGLUwAmop/EwTAnxa/8CkvhjanN dor3v3iaKa1kyZx+S/lRp+4VrvP/O1xj763ze/SVLWv6TF+Fb4zL/q3oyFXLF9RdJKBS96/h2Ad TlofX1zRnzF1+okXL/4ZqSlFzXmqJ5q4YcSGjLwzC4utvPHdL3hP+ZoWbiPj55EOH1a9GGZc/eu Yzx7UoTMAv4rbR9LQJAd+ZFnSwtAVbbMo8HL7YYFdWBLdo+9Ugb/vw/2Ht2lpvwnKOuQavrrc7Z +lzzLDyh3insI/7sy3lcmf0+yWYL1Xe3mQpH8ckdjAvwyhrh2NTiGnu1c+x/EkPv/b9nG8vcvja 5Cjd95/kijnPKFlvb3j8ufPx92fKl7bIbTlaFyxXzSoDAA== X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 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.2 required=5.0 tests=BAYES_00,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?1758714313103908351?= X-GMAIL-MSGID: =?utf-8?q?1758714313103908351?= .probe_new() doesn't get the i2c_device_id * parameter, so determine that explicitly in the probe function. Reviewed-by: Greg Kroah-Hartman Link: https://lore.kernel.org/lkml/20221118224540.619276-572-uwe@kleine-koenig.org Signed-off-by: Uwe Kleine-König --- 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, };