Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba52a7fc authored by Sachin Kamat's avatar Sachin Kamat Committed by Dmitry Torokhov
Browse files

Input: tegra-kbc - convert to devm_ioremap_resource() 



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: default avatarSachin Kamat <sachin.kamat@linaro.org>
Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 688d794c

drivers/input/keyboard/tegra-kbc.c

+4 −5
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/slab.h>

#include <linux/input/matrix_keypad.h>

#include <linux/clk/tegra.h>

#include <linux/err.h>



#define KBC_MAX_GPIO	24

#define KBC_MAX_KPENT	8
@@ -608,11 +609,9 @@ static int tegra_kbc_probe(struct platform_device *pdev) 


	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)) {