diff options
author | Mark Brown <broonie@linaro.org> | 2013-06-26 07:40:47 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-27 04:45:23 -0400 |
commit | 3bed3344c82623f6a37f3032e307d9af5b2d7519 (patch) | |
tree | 007d0553ae19b0024972ae04b0cdd40fd8aa15eb /sound/soc/txx9/txx9aclc-ac97.c | |
parent | 65fb3e726c5b21f0c4b76e69d8e1dae961ae74e8 (diff) |
ASoC: txx9aclc_ac97: Convert to devm_ioremap_resource()
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/txx9/txx9aclc-ac97.c')
-rw-r--r-- | sound/soc/txx9/txx9aclc-ac97.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index 8a2840304d28..8ee8d4220014 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c | |||
@@ -188,9 +188,9 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) | |||
188 | if (!r) | 188 | if (!r) |
189 | return -EBUSY; | 189 | return -EBUSY; |
190 | 190 | ||
191 | if (!devm_request_mem_region(&pdev->dev, r->start, resource_size(r), | 191 | drvdata->base = devm_ioremap_resource(&pdev->dev, r); |
192 | dev_name(&pdev->dev))) | 192 | if (IS_ERR(drvdata->base)) |
193 | return -EBUSY; | 193 | return PTR_ERR(drvdata->base); |
194 | 194 | ||
195 | drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); | 195 | drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); |
196 | if (!drvdata) | 196 | if (!drvdata) |
@@ -201,9 +201,6 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) | |||
201 | r->start >= TXX9_DIRECTMAP_BASE && | 201 | r->start >= TXX9_DIRECTMAP_BASE && |
202 | r->start < TXX9_DIRECTMAP_BASE + 0x400000) | 202 | r->start < TXX9_DIRECTMAP_BASE + 0x400000) |
203 | drvdata->physbase |= 0xf00000000ull; | 203 | drvdata->physbase |= 0xf00000000ull; |
204 | drvdata->base = devm_ioremap(&pdev->dev, r->start, resource_size(r)); | ||
205 | if (!drvdata->base) | ||
206 | return -EBUSY; | ||
207 | err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq, | 204 | err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq, |
208 | 0, dev_name(&pdev->dev), drvdata); | 205 | 0, dev_name(&pdev->dev), drvdata); |
209 | if (err < 0) | 206 | if (err < 0) |