From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE0C6C43461 for ; Mon, 14 Sep 2020 15:51:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 58B21208DB for ; Mon, 14 Sep 2020 15:51:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="lIN9VuTh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726058AbgINPv0 (ORCPT ); Mon, 14 Sep 2020 11:51:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726540AbgINPqf (ORCPT ); Mon, 14 Sep 2020 11:46:35 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 584B6C0611C1 for ; Mon, 14 Sep 2020 08:46:16 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id g4so181334wrs.5 for ; Mon, 14 Sep 2020 08:46:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O9pQgjz751iVGj7/u/8+uN16bEVSQUsjB9tkIsCDk5g=; b=lIN9VuThgSWgtkT0CPrxAmZJBFPajMgZvlK6WBEJci+7VcHMinR6YTPsTjr3c+40ir eup5AtMn9N8INDAa4C31k7orbaGK2FvNJU/4FAEqcn49e4r5e0ZkZf6i1UBNvCVreJXw gv8yvvQ1keAJF1SVvOdc3Gnq0VM4wLKmwWLcl5vnvdpxKZDKKi0M0FX5nFQmop1gnHue pV8lC2X/r8bTaJZr83ybk1qovXQFF7kH+exbY7Nz6w3ww1y5+/SlJ8V9n5qJiu/1Z4GW hjhPSgfuD3vvLLVnwVqBw2EXSxOs1m3XRRM8Hm/K6u5M52owR6zC8Cr8rSFsDiGFYMr/ OIOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O9pQgjz751iVGj7/u/8+uN16bEVSQUsjB9tkIsCDk5g=; b=uD0yGOcRK+LaBK3wdBlTdLmn9I+EsCmTYXa2lRDPJLenu0kl1PtDGOsVsHCWOAePwf 57qWPuC235sj6vkkvMON71SUfWXwbMRhZGJifxv3JsB1vcjX1pN13HXh40eB+QDKN4AI 6hJz0+2iMoFO9KKEQPc8jAMKCYee6ff1pquO+s46vkCaNm2FlIWFL0P1yooTmH5gox8v gzpHkG+g9945rXIh+u0ZULaA7Xxz5PKUBLkBkmEU2FuQay/7j6LkvHbs6uPswp+Asrrm GaTuzHnxrAAjceMD3mLzt9Df8F/2BpwptT7nPp1h5SgTY9HBJSQPjM8zLoKbZFfsqHDH D0HA== X-Gm-Message-State: AOAM531Zjnd47aads978HD3HW5ZOoU7360hW/5mwUXlCWDd0IJMMI9gJ EgnrsM3b9h/TX88/9wP0LhrbtA== X-Google-Smtp-Source: ABdhPJzZbWq+TR+12hOTNI+zSoNInOlSAYteHGVr95cVRt/2rb4O76JSAxLdv5F6O0yzn8nJQ0PIfw== X-Received: by 2002:adf:f885:: with SMTP id u5mr16013755wrp.382.1600098375091; Mon, 14 Sep 2020 08:46:15 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id l19sm19510448wmi.8.2020.09.14.08.46.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 08:46:14 -0700 (PDT) From: Bartosz Golaszewski To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v3 11/14] rtc: rx8010: switch to using the preferred RTC API Date: Mon, 14 Sep 2020 17:45:58 +0200 Message-Id: <20200914154601.32245-12-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200914154601.32245-1-brgl@bgdev.pl> References: <20200914154601.32245-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bartosz Golaszewski Use devm_rtc_allocate_device() + rtc_register_device() instead of the deprecated devm_rtc_device_register(). Signed-off-by: Bartosz Golaszewski --- drivers/rtc/rtc-rx8010.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/rtc/rtc-rx8010.c b/drivers/rtc/rtc-rx8010.c index aa357f800ad4..6aeed3802670 100644 --- a/drivers/rtc/rtc-rx8010.c +++ b/drivers/rtc/rtc-rx8010.c @@ -418,7 +418,6 @@ static int rx8010_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct i2c_adapter *adapter = client->adapter; - const struct rtc_class_ops *rtc_ops; struct device *dev = &client->dev; struct rx8010_data *rx8010; int err = 0; @@ -440,6 +439,10 @@ static int rx8010_probe(struct i2c_client *client, if (err) return err; + rx8010->rtc = devm_rtc_allocate_device(dev); + if (IS_ERR(rx8010->rtc)) + return PTR_ERR(rx8010->rtc); + if (client->irq > 0) { dev_info(dev, "IRQ %d supplied\n", client->irq); err = devm_request_threaded_irq(dev, client->irq, NULL, @@ -451,21 +454,14 @@ static int rx8010_probe(struct i2c_client *client, return err; } - rtc_ops = &rx8010_rtc_ops_alarm; + rx8010->rtc->ops = &rx8010_rtc_ops_alarm; } else { - rtc_ops = &rx8010_rtc_ops_default; - } - - rx8010->rtc = devm_rtc_device_register(dev, client->name, - rtc_ops, THIS_MODULE); - if (IS_ERR(rx8010->rtc)) { - dev_err(dev, "unable to register the class device\n"); - return PTR_ERR(rx8010->rtc); + rx8010->rtc->ops = &rx8010_rtc_ops_default; } rx8010->rtc->max_user_freq = 1; - return 0; + return rtc_register_device(rx8010->rtc); } static struct i2c_driver rx8010_driver = { -- 2.26.1