From 2ff6e91b1e09d61bc2cefe391bc6207bfbf5d2e6 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Mon, 21 Jan 2013 11:09:05 +0100 Subject: [PATCH] --- yaml --- r: 353671 b: refs/heads/master c: 8d1cbc98838b252af68204780bb0bfac4fe850ec h: refs/heads/master i: 353669: ca225954fea572a4ed435319d90d764dfff7bf78 353667: a41238a1967f65a4d508cc69248f709cba8bcbd5 353663: 648a7acc76ea5a5e423489eec08050e2487d2960 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/spear-keyboard.c | 8 +++----- trunk/drivers/input/serio/arc_ps2.c | 7 ++++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 2b3ec1f202c9..c38bd5ed2fe7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fd984662cfe1f7c6616992380937a07a918a6a6 +refs/heads/master: 8d1cbc98838b252af68204780bb0bfac4fe850ec diff --git a/trunk/drivers/input/keyboard/spear-keyboard.c b/trunk/drivers/input/keyboard/spear-keyboard.c index 695d237417d6..cb1e8f614631 100644 --- a/trunk/drivers/input/keyboard/spear-keyboard.c +++ b/trunk/drivers/input/keyboard/spear-keyboard.c @@ -228,11 +228,9 @@ static int spear_kbd_probe(struct platform_device *pdev) kbd->suspended_rate = pdata->suspended_rate; } - kbd->io_base = devm_request_and_ioremap(&pdev->dev, res); - if (!kbd->io_base) { - dev_err(&pdev->dev, "request-ioremap failed for kbd_region\n"); - return -ENOMEM; - } + kbd->io_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(kbd->io_base)) + return PTR_ERR(kbd->io_base); kbd->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(kbd->clk)) diff --git a/trunk/drivers/input/serio/arc_ps2.c b/trunk/drivers/input/serio/arc_ps2.c index b571eb3e4efc..c52e3e589f72 100644 --- a/trunk/drivers/input/serio/arc_ps2.c +++ b/trunk/drivers/input/serio/arc_ps2.c @@ -8,6 +8,7 @@ * Driver is originally developed by Pavel Sokolov */ +#include #include #include #include @@ -206,9 +207,9 @@ static int arc_ps2_probe(struct platform_device *pdev) return -ENOMEM; } - arc_ps2->addr = devm_request_and_ioremap(&pdev->dev, res); - if (!arc_ps2->addr) - return -EBUSY; + arc_ps2->addr = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(arc_ps2->addr)) + return PTR_ERR(arc_ps2->addr); dev_info(&pdev->dev, "irq = %d, address = 0x%p, ports = %i\n", irq, arc_ps2->addr, ARC_PS2_PORTS);