diff options
author | Thierry Reding <thierry.reding@avionic-design.de> | 2013-01-21 05:09:01 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-22 14:41:56 -0500 |
commit | 641d03422a59b1e790b7edabb16bc62da71130c3 (patch) | |
tree | 664b32773f331f9d0b60bd0feaae831791c1d3ff /drivers/gpio/gpio-spear-spics.c | |
parent | c7c9e1c372452688f0ef2af794789bbd00f9fa51 (diff) |
gpio: 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>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpio/gpio-spear-spics.c')
-rw-r--r-- | drivers/gpio/gpio-spear-spics.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-spear-spics.c b/drivers/gpio/gpio-spear-spics.c index 5f45fc4ed5d1..7a4bf7c0d98f 100644 --- a/drivers/gpio/gpio-spear-spics.c +++ b/drivers/gpio/gpio-spear-spics.c | |||
@@ -140,11 +140,9 @@ static int spics_gpio_probe(struct platform_device *pdev) | |||
140 | return -ENOMEM; | 140 | return -ENOMEM; |
141 | } | 141 | } |
142 | 142 | ||
143 | spics->base = devm_request_and_ioremap(&pdev->dev, res); | 143 | spics->base = devm_ioremap_resource(&pdev->dev, res); |
144 | if (!spics->base) { | 144 | if (IS_ERR(spics->base)) |
145 | dev_err(&pdev->dev, "request and ioremap fail\n"); | 145 | return PTR_ERR(spics->base); |
146 | return -ENOMEM; | ||
147 | } | ||
148 | 146 | ||
149 | if (of_property_read_u32(np, "st-spics,peripcfg-reg", | 147 | if (of_property_read_u32(np, "st-spics,peripcfg-reg", |
150 | &spics->perip_cfg)) | 148 | &spics->perip_cfg)) |