From patchwork Fri Nov 18 22:44:54 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: 22798 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp466761wrr; Fri, 18 Nov 2022 15:40:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf7KhOHXmaq1pB3ETXmMgL9BcaXhnFyaYWKgR96wX7BhUotVnnHyfaMZXRRQA5kepSv39Ehs X-Received: by 2002:a17:906:719:b0:781:8003:9b08 with SMTP id y25-20020a170906071900b0078180039b08mr8364594ejb.180.1668814856092; Fri, 18 Nov 2022 15:40:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668814856; cv=none; d=google.com; s=arc-20160816; b=MF3WYulQkwAXpkdDczjGgcHba3YkZmeOw/WAweckGwaF9fU2zc4R/ngNmY4kBV03G/ nFXyX+kEaTDye+/vr1JXBYKsjIY4G7nKp2CjGqcwr10YMizPZd/DKHcjQSr1YCuCtlgP NxlGKv1daUtzM5LoFH3EmNfa/8zjVvWRbFGtBPlCLSwTu1KMw7X6YOi3aBQzRqroIDbA m4mma4is+GPsb+KAFgxHx0aQNyadlUbpwsYw+p7bFy+zsaxYQ9f8SGPd4fi0AVepU0OU 1iZ2aKemwtyaNehfle4LQBn+2fTfJRwVedZnM3pJWQkvYEngYCYOEjx3reirid6Bs0Wa VHKw== 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=kmjBD/QNR+aaxx2imjzbvcJcUB4cyerr5Q8BQp5mrBc=; b=Lt82L0aMekJOwlgqhp49y0PjKcwJagFPFQFWLjbNDqVqvZPS4Zb3TigFhp2gz4Uyqo O8Wun1Evbk8rc8Q3/7ex8Lx963BJzfqQ2QViH/jYZV3T8lsmZx9ID9J4WvzJDXCYr2tT qoOAvnHO8WwJe5ZvF1KHIw+UIk/upaQy1qvp+nVkiwLycbY2ox39elPEpZBvHJNWmTkh dZf16kJUaOvaf5aO13SHtBNfDy71qojoeuK0XsmxwVZEi4UwAGmbJFT7pMznTNBgLZC4 qpIrF9fhD7pzUTs5I0s19ubVHIKuOOqy4LQ9K90rdBTTESCL7nsSWIAul1YWsK5+OGXL m/JA== 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 y8-20020a056402170800b0046938445a51si810939edu.499.2022.11.18.15.40.32; Fri, 18 Nov 2022 15:40:56 -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 S236610AbiKRXje (ORCPT + 99 others); Fri, 18 Nov 2022 18:39:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236711AbiKRXhn (ORCPT ); Fri, 18 Nov 2022 18:37:43 -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 CE96EC2873 for ; Fri, 18 Nov 2022 15:22: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 1owA9e-0005Ao-U5; Fri, 18 Nov 2022 23:48:14 +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 1owA9b-0058qi-Sl; Fri, 18 Nov 2022 23:48:12 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1owA9c-0000TB-0A; Fri, 18 Nov 2022 23:48:12 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Angel Iglesias , Lee Jones , Grant Likely , Wolfram Sang , Alessandro Zummo , Alexandre Belloni Cc: linux-i2c@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 560/606] rtc: ds1307: Convert to i2c's .probe_new() Date: Fri, 18 Nov 2022 23:44:54 +0100 Message-Id: <20221118224540.619276-561-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?1749879206110436081?= X-GMAIL-MSGID: =?utf-8?q?1749879206110436081?= 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/rtc/rtc-ds1307.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 7c2276cf5514..b49c02fd78f7 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -1713,9 +1713,9 @@ static const struct regmap_config regmap_config = { .val_bits = 8, }; -static int ds1307_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ds1307_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct ds1307 *ds1307; const void *match; int err = -ENODEV; @@ -2012,7 +2012,7 @@ static struct i2c_driver ds1307_driver = { .name = "rtc-ds1307", .of_match_table = ds1307_of_match, }, - .probe = ds1307_probe, + .probe_new = ds1307_probe, .id_table = ds1307_id, };