openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Vladimir Zapolskiy 2015-06-30 15:00:07 -07:00 committed by Linus Torvalds
parent 0030edf296
commit abdd4a7025
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/crypto/marvell/cesa.c
View File

@ -321,9 +321,8 @@ static int mv_cesa_get_sram(struct platform_device *pdev, int idx)
const char *res_name = "sram"; const char *res_name = "sram";
struct resource *res; struct resource *res;
engine->pool = of_get_named_gen_pool(cesa->dev->of_node, engine->pool = of_gen_pool_get(cesa->dev->of_node,
"marvell,crypto-srams", "marvell,crypto-srams", idx);
idx);
if (engine->pool) { if (engine->pool) {
engine->sram = gen_pool_dma_alloc(engine->pool, engine->sram = gen_pool_dma_alloc(engine->pool,
cesa->sram_size, cesa->sram_size,

2
drivers/dma/mmp_tdma.c
View File

@ -657,7 +657,7 @@ static int mmp_tdma_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&tdev->device.channels); INIT_LIST_HEAD(&tdev->device.channels);
if (pdev->dev.of_node) if (pdev->dev.of_node)
pool = of_get_named_gen_pool(pdev->dev.of_node, "asram", 0); pool = of_gen_pool_get(pdev->dev.of_node, "asram", 0);
else else
pool = sram_get_gpool("asram"); pool = sram_get_gpool("asram");
if (!pool) { if (!pool) {

2
drivers/media/platform/coda/coda-common.c
View File

@ -2155,7 +2155,7 @@ static int coda_probe(struct platform_device *pdev)
} }
/* Get IRAM pool from device tree or platform data */ /* Get IRAM pool from device tree or platform data */
pool = of_get_named_gen_pool(np, "iram", 0); pool = of_gen_pool_get(np, "iram", 0);
if (!pool && pdata) if (!pool && pdata)
pool = gen_pool_get(pdata->iram_dev); pool = gen_pool_get(pdata->iram_dev);
if (!pool) { if (!pool) {

4
include/linux/genalloc.h
View File

@ -125,10 +125,10 @@ bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start,
size_t size); size_t size);
#ifdef CONFIG_OF #ifdef CONFIG_OF
extern struct gen_pool *of_get_named_gen_pool(struct device_node *np, extern struct gen_pool *of_gen_pool_get(struct device_node *np,
const char *propname, int index); const char *propname, int index);
#else #else
static inline struct gen_pool *of_get_named_gen_pool(struct device_node *np, static inline struct gen_pool *of_gen_pool_get(struct device_node *np,
const char *propname, int index) const char *propname, int index)
{ {
return NULL; return NULL;

6
lib/genalloc.c
View File

@ -620,7 +620,7 @@ EXPORT_SYMBOL_GPL(gen_pool_get);
#ifdef CONFIG_OF #ifdef CONFIG_OF
/** /**
* of_get_named_gen_pool - find a pool by phandle property * of_gen_pool_get - find a pool by phandle property
* @np: device node * @np: device node
* @propname: property name containing phandle(s) * @propname: property name containing phandle(s)
* @index: index into the phandle array * @index: index into the phandle array
@ -629,7 +629,7 @@ EXPORT_SYMBOL_GPL(gen_pool_get);
* address of the device tree node pointed at by the phandle property, * address of the device tree node pointed at by the phandle property,
* or NULL if not found. * or NULL if not found.
*/ */
struct gen_pool *of_get_named_gen_pool(struct device_node *np, struct gen_pool *of_gen_pool_get(struct device_node *np,
const char *propname, int index) const char *propname, int index)
{ {
struct platform_device *pdev; struct platform_device *pdev;
@ -644,5 +644,5 @@ struct gen_pool *of_get_named_gen_pool(struct device_node *np,
return NULL; return NULL;
return gen_pool_get(&pdev->dev); return gen_pool_get(&pdev->dev);
} }
EXPORT_SYMBOL_GPL(of_get_named_gen_pool); EXPORT_SYMBOL_GPL(of_gen_pool_get);
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */

2
sound/core/memalloc.c
View File

@ -124,7 +124,7 @@ static void snd_malloc_dev_iram(struct snd_dma_buffer *dmab, size_t size)
dmab->addr = 0; dmab->addr = 0;
if (dev->of_node) if (dev->of_node)
pool = of_get_named_gen_pool(dev->of_node, "iram", 0); pool = of_gen_pool_get(dev->of_node, "iram", 0);
if (!pool) if (!pool)
return; return;