Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()

To be consistent with other kernel interface namings, rename
of_get_named_gen_pool() to of_gen_pool_get(). In the original function
name "_named" suffix references to a device tree property, which contains
a phandle to a device and the corresponding device driver is assumed to
register a gen_pool object.

Due to a weak relation and to avoid any confusion (e.g. in future
possible scenario if gen_pool objects are named) the suffix is removed.

[sfr@canb.auug.org.au: crypto/marvell/cesa - fix up for of_get_named_gen_pool() rename]
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Vladimir Zapolskiy and committed by
Linus Torvalds
abdd4a70 0030edf2

+10 -11
+2 -3
drivers/crypto/marvell/cesa.c
··· 321 321 const char *res_name = "sram"; 322 322 struct resource *res; 323 323 324 - engine->pool = of_get_named_gen_pool(cesa->dev->of_node, 325 - "marvell,crypto-srams", 326 - idx); 324 + engine->pool = of_gen_pool_get(cesa->dev->of_node, 325 + "marvell,crypto-srams", idx); 327 326 if (engine->pool) { 328 327 engine->sram = gen_pool_dma_alloc(engine->pool, 329 328 cesa->sram_size,
+1 -1
drivers/dma/mmp_tdma.c
··· 657 657 INIT_LIST_HEAD(&tdev->device.channels); 658 658 659 659 if (pdev->dev.of_node) 660 - pool = of_get_named_gen_pool(pdev->dev.of_node, "asram", 0); 660 + pool = of_gen_pool_get(pdev->dev.of_node, "asram", 0); 661 661 else 662 662 pool = sram_get_gpool("asram"); 663 663 if (!pool) {
+1 -1
drivers/media/platform/coda/coda-common.c
··· 2155 2155 } 2156 2156 2157 2157 /* Get IRAM pool from device tree or platform data */ 2158 - pool = of_get_named_gen_pool(np, "iram", 0); 2158 + pool = of_gen_pool_get(np, "iram", 0); 2159 2159 if (!pool && pdata) 2160 2160 pool = gen_pool_get(pdata->iram_dev); 2161 2161 if (!pool) {
+2 -2
include/linux/genalloc.h
··· 125 125 size_t size); 126 126 127 127 #ifdef CONFIG_OF 128 - extern struct gen_pool *of_get_named_gen_pool(struct device_node *np, 128 + extern struct gen_pool *of_gen_pool_get(struct device_node *np, 129 129 const char *propname, int index); 130 130 #else 131 - static inline struct gen_pool *of_get_named_gen_pool(struct device_node *np, 131 + static inline struct gen_pool *of_gen_pool_get(struct device_node *np, 132 132 const char *propname, int index) 133 133 { 134 134 return NULL;
+3 -3
lib/genalloc.c
··· 620 620 621 621 #ifdef CONFIG_OF 622 622 /** 623 - * of_get_named_gen_pool - find a pool by phandle property 623 + * of_gen_pool_get - find a pool by phandle property 624 624 * @np: device node 625 625 * @propname: property name containing phandle(s) 626 626 * @index: index into the phandle array ··· 629 629 * address of the device tree node pointed at by the phandle property, 630 630 * or NULL if not found. 631 631 */ 632 - struct gen_pool *of_get_named_gen_pool(struct device_node *np, 632 + struct gen_pool *of_gen_pool_get(struct device_node *np, 633 633 const char *propname, int index) 634 634 { 635 635 struct platform_device *pdev; ··· 644 644 return NULL; 645 645 return gen_pool_get(&pdev->dev); 646 646 } 647 - EXPORT_SYMBOL_GPL(of_get_named_gen_pool); 647 + EXPORT_SYMBOL_GPL(of_gen_pool_get); 648 648 #endif /* CONFIG_OF */
+1 -1
sound/core/memalloc.c
··· 124 124 dmab->addr = 0; 125 125 126 126 if (dev->of_node) 127 - pool = of_get_named_gen_pool(dev->of_node, "iram", 0); 127 + pool = of_gen_pool_get(dev->of_node, "iram", 0); 128 128 129 129 if (!pool) 130 130 return;