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>

diff --git a/drivers/crypto/marvell/cesa.c b/drivers/crypto/marvell/cesa.c
index a432633bced43243780cf3318aa1f223a5ac9746..1c6f98dd88f4958003d6da53ce43933e9e016d45 100644 (file)
--- a/drivers/crypto/marvell/cesa.c
+++ b/drivers/crypto/marvell/cesa.c
@@ -321,9 +321,8 @@ static int mv_cesa_get_sram(struct platform_device *pdev, int idx)
        const char *res_name = "sram";
        struct resource *res;
 
-       engine->pool = of_get_named_gen_pool(cesa->dev->of_node,
-                                            "marvell,crypto-srams",
-                                            idx);
+       engine->pool = of_gen_pool_get(cesa->dev->of_node,
+                                      "marvell,crypto-srams", idx);
        if (engine->pool) {
                engine->sram = gen_pool_dma_alloc(engine->pool,
                                                  cesa->sram_size,

diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index 449e785def17d2af759a4b82e1a0b5723b85d4ca..e683761e0f8f899c0d693efc7714ed1194fabc0c 100644 (file)
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -657,7 +657,7 @@ static int mmp_tdma_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&tdev->device.channels);
 
        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
                pool = sram_get_gpool("asram");
        if (!pool) {

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 6e640c0f0b35ca9aec53349fc1e31506de723777..58f65486de332cd893d6175ad98ca405c999a221 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2155,7 +2155,7 @@ static int coda_probe(struct platform_device *pdev)
        }
 
        /* 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)
                pool = gen_pool_get(pdata->iram_dev);
        if (!pool) {

diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h
index 015d17068615589c447b8f03a265cae7fb5a0ba7..5383bb1394a1a75abc932c3a0fece2fc58f8a076 100644 (file)
--- a/include/linux/genalloc.h
+++ b/include/linux/genalloc.h
@@ -125,10 +125,10 @@ bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start,
                        size_t size);
 
 #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);
 #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)
 {
        return NULL;

diff --git a/lib/genalloc.c b/lib/genalloc.c
index 948e92cd9794e3b3d3e9b5d62336850dab93151d..daf0afb6d979e1074cdcee38cd69d2de3a94e162 100644 (file)
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -620,7 +620,7 @@ EXPORT_SYMBOL_GPL(gen_pool_get);
 
 #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
  * @propname: property name containing phandle(s)
  * @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,
  * 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)
 {
        struct platform_device *pdev;
@@ -644,5 +644,5 @@ struct gen_pool *of_get_named_gen_pool(struct device_node *np,
                return NULL;
        return gen_pool_get(&pdev->dev);
 }
-EXPORT_SYMBOL_GPL(of_get_named_gen_pool);
+EXPORT_SYMBOL_GPL(of_gen_pool_get);
 #endif /* CONFIG_OF */

diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index 082509eb805d5395ed356ef0e9378432f891b96e..f05cb6a8cbe02ed03a3f27499b08a8b36190bcd1 100644 (file)
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -124,7 +124,7 @@ static void snd_malloc_dev_iram(struct snd_dma_buffer *dmab, size_t size)
        dmab->addr = 0;
 
        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)
                return;