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,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 84023C5517A for ; Mon, 9 Nov 2020 16:34:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E0A920789 for ; Mon, 9 Nov 2020 16:34:36 +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="N0W8LFoN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730569AbgKIQef (ORCPT ); Mon, 9 Nov 2020 11:34:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730521AbgKIQea (ORCPT ); Mon, 9 Nov 2020 11:34:30 -0500 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31F3AC0613D4 for ; Mon, 9 Nov 2020 08:34:29 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id s13so8511829wmh.4 for ; Mon, 09 Nov 2020 08:34:29 -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=VBKmNaU6GzDEF2v8GsYhoQiOn0zT7fReWvIysKZmWgI=; b=N0W8LFoNVa0dpGQmQ48le1Ab9L5UxXqxtwU/lI1MyEUXNapCeCNSLhmx/lljZ2lzY9 t9Zn4gqpIaNiEmz3pJl1Gm1JgqBqlkCrFQYzE7QwFjXAeWrs9sGGnkR2kSfCJcr5ZkOY xO0PZ2TGnYtIG/Kor9NEhLfJZavYKGhwKEXjS4pE03DOVNsDgwuyY/WIcylnJ3WifmBx RCSSZNuuGDYrtQpDTmqVDOoZXf2uxh8I8PnxRYfeO4HO/Xd+41Zbiy1tQZx2CEhsRoIQ 8mJn9DlCY955T6RRm27tcVJeen+5s+P7wHSsQ+vf3qoaWc5ZpV2mCNLg8oMdLF9RNMtH CnkQ== 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=VBKmNaU6GzDEF2v8GsYhoQiOn0zT7fReWvIysKZmWgI=; b=ccC0R7e9SbaFi3cH/CW4Lf8nt3FmyS5gfzm9Ygrh1mDa9YlRFDZuf8bophMDPLo2fM oD2Ck5sG0ux1GuT4o7n7mtWc6o/Q36XAmWL7FnCmK4NKdd+OM+FgK24jasraVkesZ78i StiYPSCJSYSXU8Xaxyt+hvrhzpmg8i1R7+wyD9/MO8P0omeTWkwZyifG+JjIidrX/eHm Pdi2YvpbRSO5t04AReko+ZmPcGO57ZBrWxS2O87qLYDgD4kEuA+ResWdN0ThYZk7/hDu 1zNi7QwWLxNhhTGB9PZQzvm5ay1gVjy8YjhWu9pM8ELFDc9H97kh/PxV7bFLZPduzX0t 2W+Q== X-Gm-Message-State: AOAM5319KEadqySYvklhMP47jmxQ3kcsIcwOzEnDj+WPtWr3dIeAIiD4 qyRODwW+RYwk9jyStXhcVTZ60A== X-Google-Smtp-Source: ABdhPJwcyJzgDmPBmOFmreWEJzPWVt2t1FRZO6tgAevOrfZzo3hvImiL7px5w9jYTtd2fyhXInIe8A== X-Received: by 2002:a1c:a90e:: with SMTP id s14mr11578wme.46.1604939668010; Mon, 09 Nov 2020 08:34:28 -0800 (PST) Received: from debian-brgl.home (amarseille-656-1-4-167.w90-8.abo.wanadoo.fr. [90.8.158.167]) by smtp.gmail.com with ESMTPSA id 89sm15072542wrp.58.2020.11.09.08.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 08:34:27 -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 8/8] rtc: shrink devm_rtc_allocate_device() Date: Mon, 9 Nov 2020 17:34:09 +0100 Message-Id: <20201109163409.24301-9-brgl@bgdev.pl> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201109163409.24301-1-brgl@bgdev.pl> References: <20201109163409.24301-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 We don't need to use devres_alloc() & devres_add() manually if all we want to manage is a single pointer. We can shrink the code by using devm_add_action_or_reset() instead. The number of allocations stays the same. Signed-off-by: Bartosz Golaszewski --- drivers/rtc/class.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index b8a34ee039ad..a1b3711aaf01 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c @@ -337,48 +337,37 @@ static void devm_rtc_unregister_device(void *data) put_device(&rtc->dev); } -static void devm_rtc_release_device(struct device *dev, void *res) +static void devm_rtc_release_device(void *res) { - struct rtc_device *rtc = *(struct rtc_device **)res; + struct rtc_device *rtc = res; put_device(&rtc->dev); } struct rtc_device *devm_rtc_allocate_device(struct device *dev) { - struct rtc_device **ptr, *rtc; + struct rtc_device *rtc; int id, err; id = rtc_device_get_id(dev); if (id < 0) return ERR_PTR(id); - ptr = devres_alloc(devm_rtc_release_device, sizeof(*ptr), GFP_KERNEL); - if (!ptr) { - err = -ENOMEM; - goto exit_ida; - } - rtc = rtc_allocate_device(); if (!rtc) { - err = -ENOMEM; - goto exit_devres; + ida_simple_remove(&rtc_ida, id); + return ERR_PTR(-ENOMEM); } - *ptr = rtc; - devres_add(dev, ptr); - rtc->id = id; rtc->dev.parent = dev; dev_set_name(&rtc->dev, "rtc%d", id); - return rtc; + err = devm_add_action_or_reset(dev, devm_rtc_release_device, rtc); + if (err) + return ERR_PTR(err); -exit_devres: - devres_free(ptr); -exit_ida: - ida_simple_remove(&rtc_ida, id); - return ERR_PTR(err); + return rtc; } EXPORT_SYMBOL_GPL(devm_rtc_allocate_device); -- 2.29.1