diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-03-11 20:18:15 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-12 16:26:27 -0700 |
| commit | 388f7bd24d2ffc945ad08be3a592672c1e32156e (patch) | |
| tree | 3ea9a9fa65d3ce7400ecb07a8b6a69da4de78906 /drivers/w1/masters | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
| download | linux-388f7bd24d2ffc945ad08be3a592672c1e32156e.tar.bz2 | |
w1: mxc_w1: Convert to devm_ioremap_resource()
According to Documentation/driver-model/devres.txt:
devm_request_and_ioremap() : obsoleted by devm_ioremap_resource()
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1/masters')
| -rw-r--r-- | drivers/w1/masters/mxc_w1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 950d354d50e2..47e12cfc2a57 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c @@ -121,9 +121,9 @@ static int mxc_w1_probe(struct platform_device *pdev) mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - mdev->regs = devm_request_and_ioremap(&pdev->dev, res); - if (!mdev->regs) - return -EBUSY; + mdev->regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(mdev->regs)) + return PTR_ERR(mdev->regs); clk_prepare_enable(mdev->clk); __raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER); |