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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8B313C433EF for ; Thu, 23 Jun 2022 12:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0/ZO2SNRR8wQO2ZeXBL8cPJLm6So9AxDdd2a3zlUbCs=; b=OctH+iK7vRcgtV 9V20dLxNuNyiif15SR9PlTIHAI3jct45FbnKRHk+Fjbk5cYDgym7dQm7/5iFxyvwLYl8R3+VOGuew OcHl2lVPLFe/DNhV41Eglq1X44KTefyJ5u8/trdZ3YAq0yefN+g0JS37/RhZ9S/zYxgYMfgy2tbbN /+nI1stEP4lH0aNxFkVwfZfWex3p0gdCpGPtiP94Pe049P5ZE7V6ozrHsnBisaiWvJWywnLmO2O1y jwpYn2KLFWYl0O7RnwQZ+Mtzd31aaLi8KOVB/aVamkouTIOGurrchOahkC+Oh4cPwuPXXru2eDtm5 FbiQub1OqQrdxCw5PBig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o4LUu-00Ep7n-Ey; Thu, 23 Jun 2022 11:59:45 +0000 Received: from mga17.intel.com ([192.55.52.151]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o4LSp-00Ensn-K0 for linux-arm-kernel@lists.infradead.org; Thu, 23 Jun 2022 11:57:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655985455; x=1687521455; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ce43flTutdWp+lJ4X2FWdJd4XMwCf5ChCFOwzmnicV8=; b=dYHxp+BIdXxrXM4jZdcMUsVYS26luXns4HNqwbL57554KLUq8ZJQIgNF okdp5ILh3GKYRaumzNupq2+DlkYnmSE8ZXL9I7wNwLYxLY6gQ5KUYJffh kYXw+IJLRyoYoBQ+WUhrq6I5zAwavAkKgAIcdacHQ8A5ocY9UT+jiO32r PJ/7r/+CunCI0yU5YHh1sXXNDJs6S30iAyvtS3dNYKgkCD/GfMxzOpmnB mIuBIk+6j5GR0tnXEQQXTipMO2N5iowObb+hIhmnEwVS3B/WpqZKJZc1d 9UY/J8BI4O6AiYpNQaD7YEh7XsH9x37molOB01EvbMsjcagwQXrp7ongJ g==; X-IronPort-AV: E=McAfee;i="6400,9594,10386"; a="261128847" X-IronPort-AV: E=Sophos;i="5.92,215,1650956400"; d="scan'208";a="261128847" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 04:57:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,215,1650956400"; d="scan'208";a="644704180" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 23 Jun 2022 04:57:20 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 3A458152; Thu, 23 Jun 2022 14:57:26 +0300 (EEST) From: Andy Shevchenko To: Stephen Boyd , Andy Shevchenko , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Michael Turquette , Russell King Subject: [PATCH v1 3/3] clkdev: Simplify devm_clk_hw_register_clkdev() function Date: Thu, 23 Jun 2022 14:57:19 +0300 Message-Id: <20220623115719.52683-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220623115719.52683-1-andriy.shevchenko@linux.intel.com> References: <20220623115719.52683-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220623_045735_763130_DF6150B2 X-CRM114-Status: GOOD ( 11.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use devm_add_action_or_reset() instead of devres_alloc() and devres_add(), which works the same. This will simplify the code. There is no functional changes. Signed-off-by: Andy Shevchenko --- drivers/clk/clkdev.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 716bb1710b89..b5eed37dc71a 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -348,9 +348,9 @@ int clk_hw_register_clkdev(struct clk_hw *hw, const char *con_id, } EXPORT_SYMBOL(clk_hw_register_clkdev); -static void devm_clkdev_release(struct device *dev, void *res) +static void devm_clkdev_release(void *res) { - clkdev_drop(*(struct clk_lookup **)res); + clkdev_drop(res); } /** @@ -371,17 +371,13 @@ static void devm_clkdev_release(struct device *dev, void *res) int devm_clk_hw_register_clkdev(struct device *dev, struct clk_hw *hw, const char *con_id, const char *dev_id) { - int rval = -ENOMEM; - struct clk_lookup **cl; - - cl = devres_alloc(devm_clkdev_release, sizeof(*cl), GFP_KERNEL); - if (cl) { - rval = do_clk_register_clkdev(hw, cl, con_id, dev_id); - if (!rval) - devres_add(dev, cl); - else - devres_free(cl); - } - return rval; + struct clk_lookup *cl; + int rval; + + rval = do_clk_register_clkdev(hw, &cl, con_id, dev_id); + if (rval) + return rval; + + return devm_add_action_or_reset(dev, devm_clkdev_release, cl); } EXPORT_SYMBOL(devm_clk_hw_register_clkdev); -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel