[PATCH 0/2] genalloc: rename dev_get_gen_pool() and of_get_named_gen_pool()

[PATCH 0/2] genalloc: rename dev_get_gen_pool() and of_get_named_gen_pool()

[Vladimir Zapolskiy]

Trivial nonfunctional change initially based on discussion
https://lkml.org/lkml/2015/6/8/588

Worth to mention that instead of the assumed new name
dev_gen_pool_get(), this change attempts to be more close to other
in-kernel interfaces and new function name is just gen_pool_get().

The change is based and tested on linux-next.

Vladimir Zapolskiy (2):
  genalloc: rename dev_get_gen_pool() to gen_pool_get()
  genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()

 arch/arm/mach-at91/pm.c                   |  2 +-
 arch/arm/mach-imx/pm-imx5.c               |  2 +-
 arch/arm/mach-imx/pm-imx6.c               |  2 +-
 drivers/dma/mmp_tdma.c                    |  2 +-
 drivers/media/platform/coda/coda-common.c |  4 ++--
 include/linux/genalloc.h                  |  6 +++---
 lib/genalloc.c                            | 14 +++++++-------
 sound/core/memalloc.c                     |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

-- 
2.1.4

[PATCH 1/2] genalloc: rename dev_get_gen_pool() to gen_pool_get()

[Vladimir Zapolskiy]

To be consistent with other genalloc interface namings, rename
dev_get_gen_pool() to gen_pool_get(). The original omitted "dev_"
prefix is removed, since it points to argument type of the function,
and so it does not bring any useful information.

Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
 arch/arm/mach-at91/pm.c                   | 2 +-
 arch/arm/mach-imx/pm-imx5.c               | 2 +-
 arch/arm/mach-imx/pm-imx6.c               | 2 +-
 drivers/media/platform/coda/coda-common.c | 2 +-
 include/linux/genalloc.h                  | 2 +-
 lib/genalloc.c                            | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 1e18476..e24df77 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -369,7 +369,7 @@ static void __init at91_pm_sram_init(void)
 		return;
 	}
 
-	sram_pool = dev_get_gen_pool(&pdev->dev);
+	sram_pool = gen_pool_get(&pdev->dev);
 	if (!sram_pool) {
 		pr_warn("%s: sram pool unavailable!\n", __func__);
 		return;
diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c
index 0309ccd..1885676 100644
--- a/arch/arm/mach-imx/pm-imx5.c
+++ b/arch/arm/mach-imx/pm-imx5.c
@@ -297,7 +297,7 @@ static int __init imx_suspend_alloc_ocram(
 		goto put_node;
 	}
 
-	ocram_pool = dev_get_gen_pool(&pdev->dev);
+	ocram_pool = gen_pool_get(&pdev->dev);
 	if (!ocram_pool) {
 		pr_warn("%s: ocram pool unavailable!\n", __func__);
 		ret = -ENODEV;
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index b01650d..93ecf55 100644
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -451,7 +451,7 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata)
 		goto put_node;
 	}
 
-	ocram_pool = dev_get_gen_pool(&pdev->dev);
+	ocram_pool = gen_pool_get(&pdev->dev);
 	if (!ocram_pool) {
 		pr_warn("%s: ocram pool unavailable!\n", __func__);
 		ret = -ENODEV;
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 6d6e0ca..6e640c0 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2157,7 +2157,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);
 	if (!pool && pdata)
-		pool = dev_get_gen_pool(pdata->iram_dev);
+		pool = gen_pool_get(pdata->iram_dev);
 	if (!pool) {
 		dev_err(&pdev->dev, "iram pool not available\n");
 		return -ENOMEM;
diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h
index 1ccaab4..015d170 100644
--- a/include/linux/genalloc.h
+++ b/include/linux/genalloc.h
@@ -119,7 +119,7 @@ extern unsigned long gen_pool_best_fit(unsigned long *map, unsigned long size,
 
 extern struct gen_pool *devm_gen_pool_create(struct device *dev,
 		int min_alloc_order, int nid);
-extern struct gen_pool *dev_get_gen_pool(struct device *dev);
+extern struct gen_pool *gen_pool_get(struct device *dev);
 
 bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start,
 			size_t size);
diff --git a/lib/genalloc.c b/lib/genalloc.c
index d214866..948e92c 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -602,12 +602,12 @@ struct gen_pool *devm_gen_pool_create(struct device *dev, int min_alloc_order,
 EXPORT_SYMBOL(devm_gen_pool_create);
 
 /**
- * dev_get_gen_pool - Obtain the gen_pool (if any) for a device
+ * gen_pool_get - Obtain the gen_pool (if any) for a device
  * @dev: device to retrieve the gen_pool from
  *
  * Returns the gen_pool for the device if one is present, or NULL.
  */
-struct gen_pool *dev_get_gen_pool(struct device *dev)
+struct gen_pool *gen_pool_get(struct device *dev)
 {
 	struct gen_pool **p = devres_find(dev, devm_gen_pool_release, NULL,
 					NULL);
@@ -616,7 +616,7 @@ struct gen_pool *dev_get_gen_pool(struct device *dev)
 		return NULL;
 	return *p;
 }
-EXPORT_SYMBOL_GPL(dev_get_gen_pool);
+EXPORT_SYMBOL_GPL(gen_pool_get);
 
 #ifdef CONFIG_OF
 /**
@@ -642,7 +642,7 @@ struct gen_pool *of_get_named_gen_pool(struct device_node *np,
 	of_node_put(np_pool);
 	if (!pdev)
 		return NULL;
-	return dev_get_gen_pool(&pdev->dev);
+	return gen_pool_get(&pdev->dev);
 }
 EXPORT_SYMBOL_GPL(of_get_named_gen_pool);
 #endif /* CONFIG_OF */
-- 
2.1.4

Re: [PATCH 1/2] genalloc: rename dev_get_gen_pool() to gen_pool_get()

[Nicolas Ferre]

Le 11/06/2015 15:28, Vladimir Zapolskiy a écrit :
> To be consistent with other genalloc interface namings, rename
> dev_get_gen_pool() to gen_pool_get(). The original omitted "dev_"
> prefix is removed, since it points to argument type of the function,
> and so it does not bring any useful information.
> 
> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
> ---
>  arch/arm/mach-at91/pm.c                   | 2 +-
>  arch/arm/mach-imx/pm-imx5.c               | 2 +-
>  arch/arm/mach-imx/pm-imx6.c               | 2 +-
>  drivers/media/platform/coda/coda-common.c | 2 +-
>  include/linux/genalloc.h                  | 2 +-
>  lib/genalloc.c                            | 8 ++++----
>  6 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index 1e18476..e24df77 100644
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -369,7 +369,7 @@ static void __init at91_pm_sram_init(void)
>  		return;
>  	}
>  
> -	sram_pool = dev_get_gen_pool(&pdev->dev);
> +	sram_pool = gen_pool_get(&pdev->dev);
>  	if (!sram_pool) {
>  		pr_warn("%s: sram pool unavailable!\n", __func__);
>  		return;

No blocked on my side. For AT91:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

> diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c
> index 0309ccd..1885676 100644
> --- a/arch/arm/mach-imx/pm-imx5.c
> +++ b/arch/arm/mach-imx/pm-imx5.c
> @@ -297,7 +297,7 @@ static int __init imx_suspend_alloc_ocram(
>  		goto put_node;
>  	}
>  
> -	ocram_pool = dev_get_gen_pool(&pdev->dev);
> +	ocram_pool = gen_pool_get(&pdev->dev);
>  	if (!ocram_pool) {
>  		pr_warn("%s: ocram pool unavailable!\n", __func__);
>  		ret = -ENODEV;
> diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
> index b01650d..93ecf55 100644
> --- a/arch/arm/mach-imx/pm-imx6.c
> +++ b/arch/arm/mach-imx/pm-imx6.c
> @@ -451,7 +451,7 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata)
>  		goto put_node;
>  	}
>  
> -	ocram_pool = dev_get_gen_pool(&pdev->dev);
> +	ocram_pool = gen_pool_get(&pdev->dev);
>  	if (!ocram_pool) {
>  		pr_warn("%s: ocram pool unavailable!\n", __func__);
>  		ret = -ENODEV;
> diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
> index 6d6e0ca..6e640c0 100644
> --- a/drivers/media/platform/coda/coda-common.c
> +++ b/drivers/media/platform/coda/coda-common.c
> @@ -2157,7 +2157,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);
>  	if (!pool && pdata)
> -		pool = dev_get_gen_pool(pdata->iram_dev);
> +		pool = gen_pool_get(pdata->iram_dev);
>  	if (!pool) {
>  		dev_err(&pdev->dev, "iram pool not available\n");
>  		return -ENOMEM;
> diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h
> index 1ccaab4..015d170 100644
> --- a/include/linux/genalloc.h
> +++ b/include/linux/genalloc.h
> @@ -119,7 +119,7 @@ extern unsigned long gen_pool_best_fit(unsigned long *map, unsigned long size,
>  
>  extern struct gen_pool *devm_gen_pool_create(struct device *dev,
>  		int min_alloc_order, int nid);
> -extern struct gen_pool *dev_get_gen_pool(struct device *dev);
> +extern struct gen_pool *gen_pool_get(struct device *dev);
>  
>  bool addr_in_gen_pool(struct gen_pool *pool, unsigned long start,
>  			size_t size);
> diff --git a/lib/genalloc.c b/lib/genalloc.c
> index d214866..948e92c 100644
> --- a/lib/genalloc.c
> +++ b/lib/genalloc.c
> @@ -602,12 +602,12 @@ struct gen_pool *devm_gen_pool_create(struct device *dev, int min_alloc_order,
>  EXPORT_SYMBOL(devm_gen_pool_create);
>  
>  /**
> - * dev_get_gen_pool - Obtain the gen_pool (if any) for a device
> + * gen_pool_get - Obtain the gen_pool (if any) for a device
>   * @dev: device to retrieve the gen_pool from
>   *
>   * Returns the gen_pool for the device if one is present, or NULL.
>   */
> -struct gen_pool *dev_get_gen_pool(struct device *dev)
> +struct gen_pool *gen_pool_get(struct device *dev)
>  {
>  	struct gen_pool **p = devres_find(dev, devm_gen_pool_release, NULL,
>  					NULL);
> @@ -616,7 +616,7 @@ struct gen_pool *dev_get_gen_pool(struct device *dev)
>  		return NULL;
>  	return *p;
>  }
> -EXPORT_SYMBOL_GPL(dev_get_gen_pool);
> +EXPORT_SYMBOL_GPL(gen_pool_get);
>  
>  #ifdef CONFIG_OF
>  /**
> @@ -642,7 +642,7 @@ struct gen_pool *of_get_named_gen_pool(struct device_node *np,
>  	of_node_put(np_pool);
>  	if (!pdev)
>  		return NULL;
> -	return dev_get_gen_pool(&pdev->dev);
> +	return gen_pool_get(&pdev->dev);
>  }
>  EXPORT_SYMBOL_GPL(of_get_named_gen_pool);
>  #endif /* CONFIG_OF */
> 


-- 
Nicolas Ferre

[PATCH 2/2] genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()

[Vladimir Zapolskiy]

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.

Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
 drivers/dma/mmp_tdma.c                    | 2 +-
 drivers/media/platform/coda/coda-common.c | 2 +-
 include/linux/genalloc.h                  | 4 ++--
 lib/genalloc.c                            | 6 +++---
 sound/core/memalloc.c                     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index 449e785..e683761 100644
--- 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 6e640c0..58f6548 100644
--- 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 015d170..5383bb1 100644
--- 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 948e92c..daf0afb 100644
--- 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 082509e..f05cb6a 100644
--- 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;
-- 
2.1.4

Re: [PATCH 2/2] genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()

[Vinod Koul]

On Thu, Jun 11, 2015 at 04:28:32PM +0300, Vladimir Zapolskiy wrote:
> 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.
> 
> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
> ---
>  drivers/dma/mmp_tdma.c                    | 2 +-
For this:

Acked-by: Vinod Koul <vinod.koul@intel.com>

-- 
~Vinod