From patchwork Thu Feb 20 10:04:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Gonzalez X-Patchwork-Id: 11393737 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E12F7924 for ; Thu, 20 Feb 2020 10:05:11 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id BE80224654 for ; Thu, 20 Feb 2020 10:05:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mZvvRZe4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BE80224654 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Date:Message-ID:To:Subject :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=LajtzkMy1RQjFSY9RBSSzhUiGA3SW3F1XMlzEdqY1JM=; b=mZvvRZe4iWql5I lvfeXcOfCwgGvGPzMSMxcNQqlqd64324sxQjWHFlAy6Fy4rveCyKmWRwFYu0FP/oPjC/yXBKqSy0D gHrYgsQGMOeL4Avk4vYBql5gpVlrJIx+FQvXxJQsWZl7WPh9CpgX3Js9OwAkm0/Qk/oGZTRxRxPnT 0H/kkLPfaAt+5jGM//FJ0wIFr/IaRCiqEbXfIXaBL2XCDeHxYhr6h4xjQWtCVKEx4L8RTqnl/yFct y5gtR2RjBL/oYrKDB7WSqfR18wPQu7j3XpBPOfr6vv5VEKAfyGmw8JlcXf9NinTCHvBZDTuPooMMx rAwQfqNdF3wcvCB8Dh3A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j4ihh-0005FO-1l; Thu, 20 Feb 2020 10:05:09 +0000 Received: from ns.iliad.fr ([212.27.33.1]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j4ihd-0005Cv-8p for linux-arm-kernel@lists.infradead.org; Thu, 20 Feb 2020 10:05:07 +0000 Received: from ns.iliad.fr (localhost [127.0.0.1]) by ns.iliad.fr (Postfix) with ESMTP id 171D120080; Thu, 20 Feb 2020 11:04:59 +0100 (CET) Received: from [192.168.108.51] (freebox.vlq16.iliad.fr [213.36.7.13]) by ns.iliad.fr (Postfix) with ESMTP id EF71D206A6; Thu, 20 Feb 2020 11:04:58 +0100 (CET) From: Marc Gonzalez Subject: [RESEND RFC PATCH v3] clk: Use new helper in managed functions To: Stephen Boyd , Michael Turquette , Kuninori Morimoto , Russell King , Sudip Mukherjee , Dmitry Torokhov , Guenter Roeck , Bjorn Andersson , Robin Murphy , Geert Uytterhoeven , Arnd Bergmann , Ard Biesheuvel , Greg Kroah-Hartman , Rafael Wysocki , Suzuki Poulose , Mark Rutland Message-ID: Date: Thu, 20 Feb 2020 11:04:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 Content-Language: en-US X-Virus-Scanned: ClamAV using ClamSMTP ; ns.iliad.fr ; Thu Feb 20 11:04:59 2020 +0100 (CET) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200220_020505_621130_F03378D8 X-CRM114-Status: GOOD ( 17.19 ) X-Spam-Score: -0.3 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [212.27.33.1 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [marc.w.gonzalez[at]free.fr] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record 2.0 SPOOFED_FREEMAIL No description available. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-clk , Linux ARM , LKML Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Introduce devm_add() to wrap devres_alloc() / devres_add() calls. Using that helper produces simpler code, and smaller object size. E.g. with gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu: text data bss dec hex filename - 1708 80 0 1788 6fc drivers/clk/clk-devres.o + 1524 80 0 1604 644 drivers/clk/clk-devres.o Signed-off-by: Marc Gonzalez --- Differences from v2 to v3 x Make devm_add() return an error-code rather than the raw data pointer (in case devres_alloc ever returns an ERR_PTR) as suggested by Geert x Provide a variadic version devm_vadd() to work with structs as suggested by Geert x Don't use nested ifs in clk_devm* implementations (hopefully simpler code logic to follow) as suggested by Geert Questions: x This patch might need to be split in two? (Introduce the new API, then use it) x Convert other subsystems to show the value of this proposal? x Maybe comment the API usage somewhere --- drivers/base/devres.c | 15 ++++++ drivers/clk/clk-devres.c | 99 ++++++++++++++-------------------------- include/linux/device.h | 3 ++ 3 files changed, 53 insertions(+), 64 deletions(-) diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 0bbb328bd17f..b2603789755b 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -685,6 +685,21 @@ int devres_release_group(struct device *dev, void *id) } EXPORT_SYMBOL_GPL(devres_release_group); +int devm_add(struct device *dev, dr_release_t func, void *arg, size_t size) +{ + void *data = devres_alloc(func, size, GFP_KERNEL); + + if (!data) { + func(dev, arg); + return -ENOMEM; + } + + memcpy(data, arg, size); + devres_add(dev, data); + return 0; +} +EXPORT_SYMBOL_GPL(devm_add); + /* * Custom devres actions allow inserting a simple function call * into the teadown sequence. diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c index be160764911b..1da69d273855 100644 --- a/drivers/clk/clk-devres.c +++ b/drivers/clk/clk-devres.c @@ -4,26 +4,22 @@ #include #include -static void devm_clk_release(struct device *dev, void *res) +static void my_clk_put(struct device *dev, void *res) { clk_put(*(struct clk **)res); } struct clk *devm_clk_get(struct device *dev, const char *id) { - struct clk **ptr, *clk; - - ptr = devres_alloc(devm_clk_release, sizeof(*ptr), GFP_KERNEL); - if (!ptr) - return ERR_PTR(-ENOMEM); - - clk = clk_get(dev, id); - if (!IS_ERR(clk)) { - *ptr = clk; - devres_add(dev, ptr); - } else { - devres_free(ptr); - } + int ret; + struct clk *clk = clk_get(dev, id); + + if (IS_ERR(clk)) + return clk; + + ret = devm_add(dev, my_clk_put, &clk, sizeof(clk)); + if (ret) + return ERR_PTR(ret); return clk; } @@ -40,14 +36,14 @@ struct clk *devm_clk_get_optional(struct device *dev, const char *id) } EXPORT_SYMBOL(devm_clk_get_optional); -struct clk_bulk_devres { - struct clk_bulk_data *clks; +struct clk_bulk_args { int num_clks; + struct clk_bulk_data *clks; }; -static void devm_clk_bulk_release(struct device *dev, void *res) +static void my_clk_bulk_put(struct device *dev, void *res) { - struct clk_bulk_devres *devres = res; + struct clk_bulk_args *devres = res; clk_bulk_put(devres->num_clks, devres->clks); } @@ -55,25 +51,17 @@ static void devm_clk_bulk_release(struct device *dev, void *res) static int __devm_clk_bulk_get(struct device *dev, int num_clks, struct clk_bulk_data *clks, bool optional) { - struct clk_bulk_devres *devres; int ret; - devres = devres_alloc(devm_clk_bulk_release, - sizeof(*devres), GFP_KERNEL); - if (!devres) - return -ENOMEM; - if (optional) ret = clk_bulk_get_optional(dev, num_clks, clks); else ret = clk_bulk_get(dev, num_clks, clks); - if (!ret) { - devres->clks = clks; - devres->num_clks = num_clks; - devres_add(dev, devres); - } else { - devres_free(devres); - } + + if (ret) + return ret; + + ret = devm_vadd(dev, my_clk_bulk_put, clk_bulk_args, num_clks, clks); return ret; } @@ -95,24 +83,15 @@ EXPORT_SYMBOL_GPL(devm_clk_bulk_get_optional); int __must_check devm_clk_bulk_get_all(struct device *dev, struct clk_bulk_data **clks) { - struct clk_bulk_devres *devres; int ret; + int num_clks = clk_bulk_get_all(dev, clks); - devres = devres_alloc(devm_clk_bulk_release, - sizeof(*devres), GFP_KERNEL); - if (!devres) - return -ENOMEM; - - ret = clk_bulk_get_all(dev, &devres->clks); - if (ret > 0) { - *clks = devres->clks; - devres->num_clks = ret; - devres_add(dev, devres); - } else { - devres_free(devres); - } + if (num_clks <= 0) + return num_clks; - return ret; + ret = devm_vadd(dev, my_clk_bulk_put, clk_bulk_args, num_clks, *clks); + + return ret ? : num_clks; } EXPORT_SYMBOL_GPL(devm_clk_bulk_get_all); @@ -128,30 +107,22 @@ static int devm_clk_match(struct device *dev, void *res, void *data) void devm_clk_put(struct device *dev, struct clk *clk) { - int ret; - - ret = devres_release(dev, devm_clk_release, devm_clk_match, clk); - - WARN_ON(ret); + WARN_ON(devres_release(dev, my_clk_put, devm_clk_match, clk)); } EXPORT_SYMBOL(devm_clk_put); struct clk *devm_get_clk_from_child(struct device *dev, struct device_node *np, const char *con_id) { - struct clk **ptr, *clk; - - ptr = devres_alloc(devm_clk_release, sizeof(*ptr), GFP_KERNEL); - if (!ptr) - return ERR_PTR(-ENOMEM); - - clk = of_clk_get_by_name(np, con_id); - if (!IS_ERR(clk)) { - *ptr = clk; - devres_add(dev, ptr); - } else { - devres_free(ptr); - } + int ret; + struct clk *clk = of_clk_get_by_name(np, con_id); + + if (IS_ERR(clk)) + return clk; + + ret = devm_add(dev, my_clk_put, &clk, sizeof(clk)); + if (ret) + return ERR_PTR(ret); return clk; } diff --git a/include/linux/device.h b/include/linux/device.h index e226030c1df3..9f18582fc0f9 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -969,6 +969,9 @@ void __iomem *devm_of_iomap(struct device *dev, struct device_node *node, int index, resource_size_t *size); +int devm_add(struct device *dev, dr_release_t func, void *arg, size_t size); +#define devm_vadd(dev, func, type, args...) \ + devm_add(dev, func, &(struct type){args}, sizeof(struct type)) /* allows to add/remove a custom action to devres stack */ int devm_add_action(struct device *dev, void (*action)(void *), void *data); void devm_remove_action(struct device *dev, void (*action)(void *), void *data);