On Tue, May 27, 2014 at 03:29:17PM +0900, Jingoo Han wrote: > Use devm_ioremap_resource() because devm_request_and_ioremap() is > obsoleted by devm_ioremap_resource(). > > Signed-off-by: Jingoo Han <[email protected]>
Acked-by: Antoine Ténart <[email protected]> Thanks! Antoine > --- > drivers/pinctrl/berlin/berlin-bg2.c | 6 +++--- > drivers/pinctrl/berlin/berlin-bg2cd.c | 6 +++--- > drivers/pinctrl/berlin/berlin-bg2q.c | 6 +++--- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/pinctrl/berlin/berlin-bg2.c > b/drivers/pinctrl/berlin/berlin-bg2.c > index 0d8fd50..dcd4f6a 100644 > --- a/drivers/pinctrl/berlin/berlin-bg2.c > +++ b/drivers/pinctrl/berlin/berlin-bg2.c > @@ -243,9 +243,9 @@ static int berlin2_pinctrl_probe(struct platform_device > *pdev) > return -ENOMEM; > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - base = devm_request_and_ioremap(&pdev->dev, res); > - if (!base) > - return -EADDRNOTAVAIL; > + base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(base)) > + return PTR_ERR(base); > > rmconfig->reg_bits = 32, > rmconfig->val_bits = 32, > diff --git a/drivers/pinctrl/berlin/berlin-bg2cd.c > b/drivers/pinctrl/berlin/berlin-bg2cd.c > index e095a5d..89d585e 100644 > --- a/drivers/pinctrl/berlin/berlin-bg2cd.c > +++ b/drivers/pinctrl/berlin/berlin-bg2cd.c > @@ -186,9 +186,9 @@ static int berlin2cd_pinctrl_probe(struct platform_device > *pdev) > return -ENOMEM; > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - base = devm_request_and_ioremap(&pdev->dev, res); > - if (!base) > - return -EADDRNOTAVAIL; > + base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(base)) > + return PTR_ERR(base); > > rmconfig->reg_bits = 32, > rmconfig->val_bits = 32, > diff --git a/drivers/pinctrl/berlin/berlin-bg2q.c > b/drivers/pinctrl/berlin/berlin-bg2q.c > index ab33a3b..9fcf983 100644 > --- a/drivers/pinctrl/berlin/berlin-bg2q.c > +++ b/drivers/pinctrl/berlin/berlin-bg2q.c > @@ -405,9 +405,9 @@ static int berlin2q_pinctrl_probe(struct platform_device > *pdev) > return -ENOMEM; > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - base = devm_request_and_ioremap(&pdev->dev, res); > - if (!base) > - return -EADDRNOTAVAIL; > + base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(base)) > + return PTR_ERR(base); > > rmconfig->reg_bits = 32, > rmconfig->val_bits = 32, > -- > 1.7.10.4 > > -- Antoine Ténart, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
