On Fri, Feb 01, 2013 at 03:37:56PM +0530, Sachin Kamat wrote:
> Use the newly introduced devm_ioremap_resource() instead of
> devm_request_and_ioremap() which provides more consistent error handling.
>
> devm_ioremap_resource() provides its own error messages; so all explicit
> error messages can be removed from the failure code paths.
>
> Signed-off-by: Sachin Kamat <sachin.ka...@linaro.org>
> Cc: Dmitry Torokhov <dmitry.torok...@gmail.com>
> Cc: linux-in...@vger.kernel.org
> ---
> Patch based & compile tested on linux-next tree (20130128).
> Changes since v1:
> * Dropped the error message as it is now handled by devm_ioremap_resource()
> itself.
> ---
> drivers/input/keyboard/tegra-kbc.c | 9 ++++-----
> 1 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/input/keyboard/tegra-kbc.c
> b/drivers/input/keyboard/tegra-kbc.c
> index 46e8ad2..fc43806 100644
> --- a/drivers/input/keyboard/tegra-kbc.c
> +++ b/drivers/input/keyboard/tegra-kbc.c
> @@ -31,6 +31,7 @@
> #include <linux/slab.h>
> #include <linux/input/tegra_kbc.h>
> #include <linux/clk/tegra.h>
> +#include <linux/err.h>
>
> #define KBC_MAX_DEBOUNCE_CNT 0x3ffu
>
> @@ -615,11 +616,9 @@ static int tegra_kbc_probe(struct platform_device *pdev)
> spin_lock_init(&kbc->lock);
> setup_timer(&kbc->timer, tegra_kbc_keypress_timer, (unsigned long)kbc);
>
> - kbc->mmio = devm_request_and_ioremap(&pdev->dev, res);
> - if (!kbc->mmio) {
> - dev_err(&pdev->dev, "Cannot request memregion/iomap address\n");
> - return -EBUSY;
> - }
> + kbc->mmio = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(kbc->mmio))
> + return PTR_ERR(kbc->mmio);
>
> kbc->clk = devm_clk_get(&pdev->dev, NULL);
> if (IS_ERR(kbc->clk)) {Reviewed-by: Thierry Reding <thierry.red...@avionic-design.de>
pgpO0T9uEb8Av.pgp
Description: PGP signature
