[PATCH] lib: devres: Mark devm_request_and_ioremap() as deprecated

[PATCH] lib: devres: Mark devm_request_and_ioremap() as deprecated

[Jingoo Han]

devm_request_and_ioremap() was obsoleted by devm_ioremap_resource().
(7509657 "lib: devres: Introduce devm_ioremap_resource()") So,
let's mark it as deprecated in order to stop using it.

Suggested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
---
 include/linux/device.h |    4 ++--
 lib/devres.c           |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/linux/device.h b/include/linux/device.h
index 67f003a..769c86b 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -627,8 +627,8 @@ extern void *devm_kmemdup(struct device *dev, const void *src, size_t len,
 			  gfp_t gfp);
 
 void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res);
-void __iomem *devm_request_and_ioremap(struct device *dev,
-			struct resource *res);
+void __deprecated __iomem *devm_request_and_ioremap(struct device *dev,
+						    struct resource *res);
 
 /* allows to add/remove a custom action to devres stack */
 int devm_add_action(struct device *dev, void (*action)(void *), void *data);
diff --git a/lib/devres.c b/lib/devres.c
index 2f16c13..44c7cb2 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -147,6 +147,7 @@ EXPORT_SYMBOL(devm_ioremap_resource);
  * @dev: Generic device to handle the resource for
  * @res: resource to be handled
  *
+ * This is deprecated, please use devm_ioremap_resource() instead.
  * Takes all necessary steps to ioremap a mem resource. Uses managed device, so
  * everything is undone on driver detach. Checks arguments, so you can feed
  * it the result from e.g. platform_get_resource() directly. Returns the
-- 
1.7.10.4

Re: [PATCH] lib: devres: Mark devm_request_and_ioremap() as deprecated

['Greg Kroah-Hartman']

On Wed, May 14, 2014 at 02:38:11PM +0900, Jingoo Han wrote:
> devm_request_and_ioremap() was obsoleted by devm_ioremap_resource().
> (7509657 "lib: devres: Introduce devm_ioremap_resource()") So,
> let's mark it as deprecated in order to stop using it.
> 
> Suggested-by: Florian Fainelli <f.fainelli@gmail.com>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> Cc: Thierry Reding <thierry.reding@gmail.com>
> ---
>  include/linux/device.h |    4 ++--
>  lib/devres.c           |    1 +
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/include/linux/device.h b/include/linux/device.h
> index 67f003a..769c86b 100644
> --- a/include/linux/device.h
> +++ b/include/linux/device.h
> @@ -627,8 +627,8 @@ extern void *devm_kmemdup(struct device *dev, const void *src, size_t len,
>  			  gfp_t gfp);
>  
>  void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res);
> -void __iomem *devm_request_and_ioremap(struct device *dev,
> -			struct resource *res);
> +void __deprecated __iomem *devm_request_and_ioremap(struct device *dev,
> +						    struct resource *res);

If no one uses it, just delete it entirely from the tree, no need to
mark __deprecated, that's not going to stop new people from using it.

Also, I see a number of existing users in Linus's tree, please remove
those usages as well.

greg k-h