From patchwork Thu May 25 20:58:40 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: 99191 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp42138vqr; Thu, 25 May 2023 14:03:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ65ifro/e1XuXTqOBStuoCAg4SEIDSHfCgMQc0uoYT8Vp0ZU8DsaX/v/yf6vdfeRYtB/Iim X-Received: by 2002:a17:903:185:b0:1ae:7421:82b5 with SMTP id z5-20020a170903018500b001ae742182b5mr2708943plg.45.1685048605645; Thu, 25 May 2023 14:03:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685048605; cv=none; d=google.com; s=arc-20160816; b=dHwhZqnHtzDSiXq+WalwoDlXyGawVfIfQ+yBc3ZuZeb3c1+uj5oLomDUP3A48mXX9E 0eYEeVGx1FEDdj04dzcebCTJdQI33AkRI90JB5wH0Tqb5PSatB/sTdOA/ukxw6fB541Q EEVHMS16lbDS6ZHauD/eOfL2DXCnJ5y5/x/+aarMzyBS+N4ZzzcmrbBeMJ+TFf1eQS76 lHfdOq9BvLDQSOvHuzZeWPg/q1q/Bqv2jnE5pkYcGrIpWQqgeJxTdrwSp9DKvnuNy8ku jkXSC2GsUfPXzgLspUc2pH0zANcjKy6PmZa3tQDE9Ov/zfxiwbmpU0glJG89cYApZtM6 NlMQ== 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 :message-id:date:subject:cc:to:from; bh=kqwhTPdl5qdePxOnIMuycfKBTA0LFZeH909kXjeAuMU=; b=Y21pSagf3kNH1K6OwKTmoHI7sNJtQZ5ndhP+kJTt+kC7VmToddlFLGXVhNiiksypN6 IbvHPgnptq1Y5cRMlbNPqCRaUQfHlM1o6PnEymj2YXPuHj1u688HOHgEvLg12vUc2N/X DC5MvYyaJNVHs+C/dHV14g+c4MIqrJZTrAY4rGEFyRUPd1cZQERPCekGEUVmMMKfEOp0 D5LXdMyM/HQwTz88AcuUYMOxLJhsuubFANx78q8VcFSS1HtIE54SYk8d7siH3HhUh6c1 M+Ltdb2IG33VS79R8ga2kvC9VeT4Lmr3Y1TtA9GrrrajxNoyP6zCqgAEQM/gPFlaVrqb 5dKQ== 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 n3-20020a170902968300b001afdfd0b363si2039807plp.489.2023.05.25.14.03.13; Thu, 25 May 2023 14:03:25 -0700 (PDT) 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 S233318AbjEYU6v (ORCPT + 99 others); Thu, 25 May 2023 16:58:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbjEYU6u (ORCPT ); Thu, 25 May 2023 16:58:50 -0400 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 BB5D4194 for ; Thu, 25 May 2023 13:58:48 -0700 (PDT) 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 1q2I2n-0008BB-W3; Thu, 25 May 2023 22:58:46 +0200 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 1q2I2n-002npV-4y; Thu, 25 May 2023 22:58:45 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1q2I2l-007xf5-VD; Thu, 25 May 2023 22:58:43 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Robin van der Gracht , Miguel Ojeda Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH] auxdisplay: Switch i2c drivers back to use .probe() Date: Thu, 25 May 2023 22:58:40 +0200 Message-Id: <20230525205840.734432-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1510; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=WDheXxcyv2C6WJm5pPhJajYgMN7v+nb7XRs/N10gpJM=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBkb8v+jh5Jj5XTs5Q6lI+/2GAdBLfmi28HhaXNS OQoxT6qH1WJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZG/L/gAKCRCPgPtYfRL+ TkxCB/9LCnlyQrxnWwWfD9PITjVN51iFgWuBioOTDpIZJVYh/774jvKt1pKEMlH0S2sY8IRHdBV etCE7YnCgLCKQys7B0YwuCJfi3mCXNO3AgP3Fuy121gy0dalMQ/hDTTxxHJ0UEM3GHnNW0LGMDW fuwvOELcm3mgm7V2WihJ8uHi3LRle3kpXTL88HpdfyfgW6g9H+750DjSZAjGq5g33NJA0bMPEJN l+r+JgMKXrEMQWUY4YsiXTC+xOx1hdpv0u2jXBfwR4+XIESCWEJAsES6vK+Pryh0HShvxxnr0eK YJlDuT+VecNqW7p2HXxe4wcsKr+3rT7dkYNFxR8aSDzmdQeW 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,T_SCC_BODY_TEXT_LINE autolearn=ham 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?1766901526617484355?= X-GMAIL-MSGID: =?utf-8?q?1766901526617484355?= After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") convert back to (the new) .probe() to be able to eventually drop .probe_new() from struct i2c_driver. Signed-off-by: Uwe Kleine-König --- drivers/auxdisplay/ht16k33.c | 2 +- drivers/auxdisplay/lcd2s.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) base-commit: ac9a78681b921877518763ba0e89202254349d1b diff --git a/drivers/auxdisplay/ht16k33.c b/drivers/auxdisplay/ht16k33.c index 02425991c159..d44814b9562a 100644 --- a/drivers/auxdisplay/ht16k33.c +++ b/drivers/auxdisplay/ht16k33.c @@ -820,7 +820,7 @@ static const struct of_device_id ht16k33_of_match[] = { MODULE_DEVICE_TABLE(of, ht16k33_of_match); static struct i2c_driver ht16k33_driver = { - .probe_new = ht16k33_probe, + .probe = ht16k33_probe, .remove = ht16k33_remove, .driver = { .name = DRIVER_NAME, diff --git a/drivers/auxdisplay/lcd2s.c b/drivers/auxdisplay/lcd2s.c index 135831a16514..6422be0dfe20 100644 --- a/drivers/auxdisplay/lcd2s.c +++ b/drivers/auxdisplay/lcd2s.c @@ -365,7 +365,7 @@ static struct i2c_driver lcd2s_i2c_driver = { .name = "lcd2s", .of_match_table = lcd2s_of_table, }, - .probe_new = lcd2s_i2c_probe, + .probe = lcd2s_i2c_probe, .remove = lcd2s_i2c_remove, .id_table = lcd2s_i2c_id, };