OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: tegra: Use devm_ioremap_resource instead of open code 

Use devm_ioremap_resource() to simplify the code.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2015-08-23 23:32:14 +08:00 committed by Mark Brown
parent 5e9a3fcfa2
commit f57ddcdfa1
5 changed files with 23 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/soc/tegra/tegra20_das.c
View File

@ -133,7 +133,7 @@ static const struct regmap_config tegra20_das_regmap_config = {
static int tegra20_das_probe(struct platform_device *pdev) static int tegra20_das_probe(struct platform_device *pdev)
{ {
struct resource *res, *region; struct resource *res;
void __iomem *regs; void __iomem *regs;
int ret = 0; int ret = 0;
@ -149,24 +149,9 @@ static int tegra20_das_probe(struct platform_device *pdev)
das->dev = &pdev->dev; das->dev = &pdev->dev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) { regs = devm_ioremap_resource(&pdev->dev, res);
dev_err(&pdev->dev, "No memory resource\n"); if (IS_ERR(regs)) {
ret = -ENODEV; ret = PTR_ERR(regs);
goto err;
}
region = devm_request_mem_region(&pdev->dev, res->start,
resource_size(res), pdev->name);
if (!region) {
dev_err(&pdev->dev, "Memory region already claimed\n");
ret = -EBUSY;
goto err;
}
regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
if (!regs) {
dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENOMEM;
goto err; goto err;
} }

23
sound/soc/tegra/tegra20_i2s.c
View File

@ -339,7 +339,7 @@ static const struct regmap_config tegra20_i2s_regmap_config = {
static int tegra20_i2s_platform_probe(struct platform_device *pdev) static int tegra20_i2s_platform_probe(struct platform_device *pdev)
{ {
struct tegra20_i2s *i2s; struct tegra20_i2s *i2s;
struct resource *mem, *memregion; struct resource *mem;
void __iomem *regs; void __iomem *regs;
int ret; int ret;
@ -362,24 +362,9 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
} }
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) { regs = devm_ioremap_resource(&pdev->dev, mem);
dev_err(&pdev->dev, "No memory resource\n"); if (IS_ERR(regs)) {
ret = -ENODEV; ret = PTR_ERR(regs);
goto err_clk_put;
}
memregion = devm_request_mem_region(&pdev->dev, mem->start,
resource_size(mem), DRV_NAME);
if (!memregion) {
dev_err(&pdev->dev, "Memory region already claimed\n");
ret = -EBUSY;
goto err_clk_put;
}
regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
if (!regs) {
dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENOMEM;
goto err_clk_put; goto err_clk_put;
} }

22
sound/soc/tegra/tegra20_spdif.c
View File

@ -265,7 +265,7 @@ static const struct regmap_config tegra20_spdif_regmap_config = {
static int tegra20_spdif_platform_probe(struct platform_device *pdev) static int tegra20_spdif_platform_probe(struct platform_device *pdev)
{ {
struct tegra20_spdif *spdif; struct tegra20_spdif *spdif;
struct resource *mem, *memregion, *dmareq; struct resource *mem, *dmareq;
void __iomem *regs; void __iomem *regs;
int ret; int ret;
@ -285,10 +285,9 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
} }
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) { regs = devm_ioremap_resource(&pdev->dev, mem);
dev_err(&pdev->dev, "No memory resource\n"); if (IS_ERR(regs))
return -ENODEV; return PTR_ERR(regs);
}
dmareq = platform_get_resource(pdev, IORESOURCE_DMA, 0); dmareq = platform_get_resource(pdev, IORESOURCE_DMA, 0);
if (!dmareq) { if (!dmareq) {
@ -296,19 +295,6 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
memregion = devm_request_mem_region(&pdev->dev, mem->start,
resource_size(mem), DRV_NAME);
if (!memregion) {
dev_err(&pdev->dev, "Memory region already claimed\n");
return -EBUSY;
}
regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
if (!regs) {
dev_err(&pdev->dev, "ioremap failed\n");
return -ENOMEM;
}
spdif->regmap = devm_regmap_init_mmio(&pdev->dev, regs, spdif->regmap = devm_regmap_init_mmio(&pdev->dev, regs,
&tegra20_spdif_regmap_config); &tegra20_spdif_regmap_config);
if (IS_ERR(spdif->regmap)) { if (IS_ERR(spdif->regmap)) {

43
sound/soc/tegra/tegra30_ahub.c
View File

@ -521,7 +521,7 @@ static int tegra30_ahub_probe(struct platform_device *pdev)
const struct tegra30_ahub_soc_data *soc_data; const struct tegra30_ahub_soc_data *soc_data;
struct reset_control *rst; struct reset_control *rst;
int i; int i;
struct resource *res0, *res1, *region; struct resource *res0, *res1;
void __iomem *regs_apbif, *regs_ahub; void __iomem *regs_apbif, *regs_ahub;
int ret = 0; int ret = 0;
@ -584,26 +584,12 @@ static int tegra30_ahub_probe(struct platform_device *pdev)
} }
res0 = platform_get_resource(pdev, IORESOURCE_MEM, 0); res0 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res0) { regs_apbif = devm_ioremap_resource(&pdev->dev, res0);
dev_err(&pdev->dev, "No apbif memory resource\n"); if (IS_ERR(regs_apbif))
return -ENODEV; return PTR_ERR(regs_apbif);
}
region = devm_request_mem_region(&pdev->dev, res0->start,
resource_size(res0), DRV_NAME);
if (!region) {
dev_err(&pdev->dev, "request region apbif failed\n");
return -EBUSY;
}
ahub->apbif_addr = res0->start; ahub->apbif_addr = res0->start;
regs_apbif = devm_ioremap(&pdev->dev, res0->start,
resource_size(res0));
if (!regs_apbif) {
dev_err(&pdev->dev, "ioremap apbif failed\n");
return -ENOMEM;
}
ahub->regmap_apbif = devm_regmap_init_mmio(&pdev->dev, regs_apbif, ahub->regmap_apbif = devm_regmap_init_mmio(&pdev->dev, regs_apbif,
&tegra30_ahub_apbif_regmap_config); &tegra30_ahub_apbif_regmap_config);
if (IS_ERR(ahub->regmap_apbif)) { if (IS_ERR(ahub->regmap_apbif)) {
@ -614,24 +600,9 @@ static int tegra30_ahub_probe(struct platform_device *pdev)
regcache_cache_only(ahub->regmap_apbif, true); regcache_cache_only(ahub->regmap_apbif, true);
res1 = platform_get_resource(pdev, IORESOURCE_MEM, 1); res1 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (!res1) { regs_ahub = devm_ioremap_resource(&pdev->dev, res1);
dev_err(&pdev->dev, "No ahub memory resource\n"); if (IS_ERR(regs_ahub))
return -ENODEV; return PTR_ERR(regs_ahub);
}
region = devm_request_mem_region(&pdev->dev, res1->start,
resource_size(res1), DRV_NAME);
if (!region) {
dev_err(&pdev->dev, "request region ahub failed\n");
return -EBUSY;
}
regs_ahub = devm_ioremap(&pdev->dev, res1->start,
resource_size(res1));
if (!regs_ahub) {
dev_err(&pdev->dev, "ioremap ahub failed\n");
return -ENOMEM;
}
ahub->regmap_ahub = devm_regmap_init_mmio(&pdev->dev, regs_ahub, ahub->regmap_ahub = devm_regmap_init_mmio(&pdev->dev, regs_ahub,
&tegra30_ahub_ahub_regmap_config); &tegra30_ahub_ahub_regmap_config);

23
sound/soc/tegra/tegra30_i2s.c
View File

@ -379,7 +379,7 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev)
struct tegra30_i2s *i2s; struct tegra30_i2s *i2s;
const struct of_device_id *match; const struct of_device_id *match;
u32 cif_ids[2]; u32 cif_ids[2];
struct resource *mem, *memregion; struct resource *mem;
void __iomem *regs; void __iomem *regs;
int ret; int ret;
@ -419,24 +419,9 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev)
} }
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) { regs = devm_ioremap_resource(&pdev->dev, mem);
dev_err(&pdev->dev, "No memory resource\n"); if (IS_ERR(regs)) {
ret = -ENODEV; ret = PTR_ERR(regs);
goto err_clk_put;
}
memregion = devm_request_mem_region(&pdev->dev, mem->start,
resource_size(mem), DRV_NAME);
if (!memregion) {
dev_err(&pdev->dev, "Memory region already claimed\n");
ret = -EBUSY;
goto err_clk_put;
}
regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
if (!regs) {
dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENOMEM;
goto err_clk_put; goto err_clk_put;
} }