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=ham 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 82244C2D0E4 for ; Thu, 19 Nov 2020 11:45:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 235162224E for ; Thu, 19 Nov 2020 11:45:14 +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="vB8nvmjR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727707AbgKSLo2 (ORCPT ); Thu, 19 Nov 2020 06:44:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727369AbgKSLmy (ORCPT ); Thu, 19 Nov 2020 06:42:54 -0500 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E0FFC061A56 for ; Thu, 19 Nov 2020 03:42:52 -0800 (PST) Received: by mail-wm1-x344.google.com with SMTP id d142so6879558wmd.4 for ; Thu, 19 Nov 2020 03:42:52 -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=XuIXtdxd3Hddpp/ixWUSaS27DBd0cPn1IjxNjFRiAV0=; b=vB8nvmjRCcQrUikYnCQaGuFsd7lmVYIq1H5Q/LZby4l/i+jrOgB4wketqh9n3MbOUd KNR5E1xDc03lTwlGTk59UHekb60iP3zBW9p5i7xWa88IvmRtiQ4d+wS+mEv/5MJDfXz5 wk4ZrKi6L21mD7qc5z8Ia1LvHA0yhbD6ejg5c8pStC7PjwD7HrX3CzdrCBArhFQGc+Os ycRq5mDP83YGeJ0kfqfdVn3V+yRe6cHGtDWBZzst+mIjG0LnduAPZSg3yZc0K2fKWtIv CoTZqPhuIWtE+yRh3TfPdkeNeofg6/v0Ay7RHngADs1NxIJ6ViJuB5GwHHJnRyG+U/hU 05fw== 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=XuIXtdxd3Hddpp/ixWUSaS27DBd0cPn1IjxNjFRiAV0=; b=OfOlUMAWvSE0rMehZjBNXNMg2G18aEJvACMqKgo+yDBSZ7hcjHrc/3NHTceABV6lin 0FL4ohVn1O4qSRbqu3fv7ocdvCy8ph6FE01wGSwZSYXi8YaPU5PTBcqFI9TIqo2g1Rk5 dFrqXD/0DSX6ZOPqcg04ncP55kYAqSSGNU9X1lqxp5MO5779IvUeCMzrm1xtcmwThI8t paLuf9Ge+Y8SwILVYejjKBLz/UeHxhO5j2eLgEY7t4MPaYU8IY2Q8yA2/3eH85FkTeat 18Sikg5s+GzLErNWmB6bLfyE1SRx9EewjP3IAern2A5qm4A7JITzsV51Timq8arGCV+7 rC6g== X-Gm-Message-State: AOAM531HEa8uimJae6eBPqMlQA6wOmShOQIIWjKyw3Mdizgop7We/G7B R4f8BiPK5+YgWwKoRUCF/aTWYA== X-Google-Smtp-Source: ABdhPJxjzYf1ITUKPYLCjY1Crmxzmqzynygw6D87W1I31043pE02Led1mw6OYZ5JD8FKxURFINdJZQ== X-Received: by 2002:a7b:c0c2:: with SMTP id s2mr3973223wmh.78.1605786171191; Thu, 19 Nov 2020 03:42:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 03:42:50 -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 44/59] rtc: rs5c372: stop using deprecated RTC API Date: Thu, 19 Nov 2020 12:41:34 +0100 Message-Id: <20201119114149.4117-45-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 label. Signed-off-by: Bartosz Golaszewski --- drivers/rtc/rtc-rs5c372.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c index 3bd6eaa0dcf6..d554c891706b 100644 --- a/drivers/rtc/rtc-rs5c372.c +++ b/drivers/rtc/rtc-rs5c372.c @@ -631,19 +631,15 @@ static int rs5c372_probe(struct i2c_client *client, I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_I2C_BLOCK)) smbus_mode = 1; - else { + else /* Still no good, give up */ - err = -ENODEV; - goto exit; - } + return -ENODEV; } rs5c372 = devm_kzalloc(&client->dev, sizeof(struct rs5c372), GFP_KERNEL); - if (!rs5c372) { - err = -ENOMEM; - goto exit; - } + if (!rs5c372) + return -ENOMEM; rs5c372->client = client; i2c_set_clientdata(client, rs5c372); @@ -659,7 +655,7 @@ static int rs5c372_probe(struct i2c_client *client, err = rs5c_get_regs(rs5c372); if (err < 0) - goto exit; + return err; /* clock may be set for am/pm or 24 hr time */ switch (rs5c372->type) { @@ -683,7 +679,7 @@ static int rs5c372_probe(struct i2c_client *client, break; default: dev_err(&client->dev, "unknown RTC type\n"); - goto exit; + return err; } /* if the oscillator lost power and no other software (like @@ -695,7 +691,7 @@ static int rs5c372_probe(struct i2c_client *client, err = rs5c_oscillator_setup(rs5c372); if (unlikely(err < 0)) { dev_err(&client->dev, "setup error\n"); - goto exit; + return err; } dev_info(&client->dev, "%s found, %s\n", @@ -712,23 +708,17 @@ static int rs5c372_probe(struct i2c_client *client, ); /* REVISIT use client->irq to register alarm irq ... */ - rs5c372->rtc = devm_rtc_device_register(&client->dev, - rs5c372_driver.driver.name, - &rs5c372_rtc_ops, THIS_MODULE); + rs5c372->rtc = devm_rtc_allocate_device(&client->dev); + if (IS_ERR(rs5c372->rtc)) + return PTR_ERR(rs5c372->rtc); - if (IS_ERR(rs5c372->rtc)) { - err = PTR_ERR(rs5c372->rtc); - goto exit; - } + rs5c372->rtc->ops = &rs5c372_rtc_ops; err = rs5c_sysfs_register(&client->dev); if (err) - goto exit; - - return 0; + return err; -exit: - return err; + return devm_rtc_register_device(rs5c372->rtc); } static int rs5c372_remove(struct i2c_client *client) -- 2.29.1