summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-sirf.c
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2013-01-21 11:09:03 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-24 13:33:23 -0800
commit84dbf809fbae0591d319a7ea76e6032ff434824c (patch)
treeab744305093c72ec795d8f873229e5d9fbff0316 /drivers/i2c/busses/i2c-sirf.c
parentf4a18312f46a6c6e0ba7b81776b01fc36edea9fc (diff)
downloadlinux-84dbf809fbae0591d319a7ea76e6032ff434824c.tar.bz2
i2c: Convert to devm_ioremap_resource()
Convert all uses of devm_request_and_ioremap() to the newly introduced devm_ioremap_resource() 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: Thierry Reding <thierry.reding@avionic-design.de> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-sirf.c')
-rw-r--r--drivers/i2c/busses/i2c-sirf.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-sirf.c b/drivers/i2c/busses/i2c-sirf.c
index 3f1818b87974..183cf05be1de 100644
--- a/drivers/i2c/busses/i2c-sirf.c
+++ b/drivers/i2c/busses/i2c-sirf.c
@@ -308,10 +308,9 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev)
goto out;
}
- siic->base = devm_request_and_ioremap(&pdev->dev, mem_res);
- if (siic->base == NULL) {
- dev_err(&pdev->dev, "IO remap failed!\n");
- err = -ENOMEM;
+ siic->base = devm_ioremap_resource(&pdev->dev, mem_res);
+ if (IS_ERR(siic->base)) {
+ err = PTR_ERR(siic->base);
goto out;
}