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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 4FF5CC6369E for ; Thu, 19 Nov 2020 11:45:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D69AB246F0 for ; Thu, 19 Nov 2020 11:45:13 +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="XbRoLlm4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727702AbgKSLoW (ORCPT ); Thu, 19 Nov 2020 06:44:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727377AbgKSLm4 (ORCPT ); Thu, 19 Nov 2020 06:42:56 -0500 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31E21C061A4B for ; Thu, 19 Nov 2020 03:42:56 -0800 (PST) Received: by mail-wr1-x444.google.com with SMTP id s8so6059377wrw.10 for ; Thu, 19 Nov 2020 03:42:56 -0800 (PST) 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=tKJOrezl7PofGkMeHFXRs5yUaQOavhTevYky12wFwic=; b=XbRoLlm4dwcM3s4evO36RDZ71beXJRc5VQRLb3lEKxDpSWCfFvfkEqzOs0KaKfOj4h 6Zbh/sL0/3sIDnL4riuA6xeqUhFGVvTQiPj0xk8Wq79tddwC9a+I6oU0z5MSy12WggQL uJEe2xL3a+JstDYg2KvLefC22fyX7tx8qV4pwLmbf2JnhkCN6scMVPi4H0ydXip1XIc7 8yomjLl0FvnnXOqngjng5tPOhlnc8nr3nbU9FExf7iANbh7H7IzjK0iBBw+TAo4LdKRt uGZreRcEUkK4XeLpmRMONf/vPaJRTkyl2F6u9U+QDQQgSbnaFQ/HeCsGcwAxA0PttjCu vQRg== 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=tKJOrezl7PofGkMeHFXRs5yUaQOavhTevYky12wFwic=; b=g1WOysR7IBsSvwYVxCnr/JcKbTfLFz/v+QZ2lP8lw1Ccc7KVESdUnZwuDBgaXeF/Aj hnYfzPLMv/yGYXSuhIjDymyZZYAkcobg/wj5nVuH5I4bd0aFLOnzaOlwQ7nWwSVJOKK5 TMoknHQ9DULRt5k/9ZdBpaywJR5kaPKhMWM7PvfM2nKUxHoG0K/zf4To7chSUaA91RZ7 qCoOBegODHkNU9UcxTPKuCR9GsNssldAHLXydXRnUl1LeyVZvR99invPmAEp9tjQFwvQ 5mvSi1PIqMA+ejFBwcOCqqhkL3U8UNWP4p4Z3IFlDWHuohwD5mcBm9IQx6NgMSkKsh9b wKxg== X-Gm-Message-State: AOAM530FgLw8gWSgICjBfKtKo3dHkjvjP/o5zbMnUEz8sOVnhIbkr6xE wYQJ6wCNqpbsfDniOXuxGXgvhA== X-Google-Smtp-Source: ABdhPJx7jZtcRAtZtQE94mHkgku6MmaiM6i7IuhhiwDpkzk/dI9+xhkTH8p3SLv98ASZ36l0MsCWoA== X-Received: by 2002:adf:b78b:: with SMTP id s11mr9647425wre.42.1605786175001; Thu, 19 Nov 2020 03:42:55 -0800 (PST) Received: from localhost.localdomain (lfbn-nic-1-190-206.w2-15.abo.wanadoo.fr. [2.15.39.206]) by smtp.gmail.com with ESMTPSA id u23sm9745178wmc.32.2020.11.19.03.42.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 03:42:53 -0800 (PST) From: Bartosz Golaszewski To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 47/59] rtc: bq4802: stop using deprecated RTC API Date: Thu, 19 Nov 2020 12:41:37 +0100 Message-Id: <20201119114149.4117-48-brgl@bgdev.pl> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201119114149.4117-1-brgl@bgdev.pl> References: <20201119114149.4117-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bartosz Golaszewski devm_rtc_device_register() is deprecated. Use devm_rtc_allocate_device() and devm_rtc_register_device() pair instead. While at it: remove unnecessary goto label. Signed-off-by: Bartosz Golaszewski --- drivers/rtc/rtc-bq4802.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/rtc/rtc-bq4802.c b/drivers/rtc/rtc-bq4802.c index 472e75668917..4661dfbddb17 100644 --- a/drivers/rtc/rtc-bq4802.c +++ b/drivers/rtc/rtc-bq4802.c @@ -145,16 +145,15 @@ static int bq4802_probe(struct platform_device *pdev) int err = -ENOMEM; if (!p) - goto out; + return err; spin_lock_init(&p->lock); p->r = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!p->r) { p->r = platform_get_resource(pdev, IORESOURCE_IO, 0); - err = -EINVAL; if (!p->r) - goto out; + return -EINVAL; } if (p->r->flags & IORESOURCE_IO) { p->ioport = p->r->start; @@ -163,29 +162,24 @@ static int bq4802_probe(struct platform_device *pdev) } else if (p->r->flags & IORESOURCE_MEM) { p->regs = devm_ioremap(&pdev->dev, p->r->start, resource_size(p->r)); - if (!p->regs){ - err = -ENOMEM; - goto out; - } + if (!p->regs) + return -ENOMEM; + p->read = bq4802_read_mem; p->write = bq4802_write_mem; } else { - err = -EINVAL; - goto out; + return -EINVAL; } platform_set_drvdata(pdev, p); - p->rtc = devm_rtc_device_register(&pdev->dev, "bq4802", - &bq4802_ops, THIS_MODULE); - if (IS_ERR(p->rtc)) { - err = PTR_ERR(p->rtc); - goto out; - } + p->rtc = devm_rtc_allocate_device(&pdev->dev); + if (IS_ERR(p->rtc)) + return PTR_ERR(p->rtc); + + p->rtc->ops = &bq4802_ops; - err = 0; -out: - return err; + return devm_rtc_register_device(p->rtc); } -- 2.29.1