diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-01-08 17:49:22 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2017-01-09 07:41:27 -0500 |
commit | 368e5fbdfc60732643f34f538823ed4bc8829827 (patch) | |
tree | 5c572ae75a05e1d925ef0366dd0eb63d6d01721b /drivers/ata | |
parent | 0fe4618d3b22d0ae44a4e650526466cf570ff8a5 (diff) |
ata: sata_mv: Convert to devm_ioremap_resource()
Convert to devm_ioremap_resource() which provides more consistent error
handling.
Note that devm_ioremap_resource() provides its own error messages.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/sata_mv.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 6eed4a72d328..00ce26d0c047 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -4067,6 +4067,7 @@ static int mv_platform_probe(struct platform_device *pdev) | |||
4067 | struct ata_host *host; | 4067 | struct ata_host *host; |
4068 | struct mv_host_priv *hpriv; | 4068 | struct mv_host_priv *hpriv; |
4069 | struct resource *res; | 4069 | struct resource *res; |
4070 | void __iomem *mmio; | ||
4070 | int n_ports = 0, irq = 0; | 4071 | int n_ports = 0, irq = 0; |
4071 | int rc; | 4072 | int rc; |
4072 | int port; | 4073 | int port; |
@@ -4085,8 +4086,9 @@ static int mv_platform_probe(struct platform_device *pdev) | |||
4085 | * Get the register base first | 4086 | * Get the register base first |
4086 | */ | 4087 | */ |
4087 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 4088 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
4088 | if (res == NULL) | 4089 | mmio = devm_ioremap_resource(&pdev->dev, res); |
4089 | return -EINVAL; | 4090 | if (IS_ERR(mmio)) |
4091 | return PTR_ERR(mmio); | ||
4090 | 4092 | ||
4091 | /* allocate host */ | 4093 | /* allocate host */ |
4092 | if (pdev->dev.of_node) { | 4094 | if (pdev->dev.of_node) { |
@@ -4130,12 +4132,7 @@ static int mv_platform_probe(struct platform_device *pdev) | |||
4130 | hpriv->board_idx = chip_soc; | 4132 | hpriv->board_idx = chip_soc; |
4131 | 4133 | ||
4132 | host->iomap = NULL; | 4134 | host->iomap = NULL; |
4133 | hpriv->base = devm_ioremap(&pdev->dev, res->start, | 4135 | hpriv->base = mmio - SATAHC0_REG_BASE; |
4134 | resource_size(res)); | ||
4135 | if (!hpriv->base) | ||
4136 | return -ENOMEM; | ||
4137 | |||
4138 | hpriv->base -= SATAHC0_REG_BASE; | ||
4139 | 4136 | ||
4140 | hpriv->clk = clk_get(&pdev->dev, NULL); | 4137 | hpriv->clk = clk_get(&pdev->dev, NULL); |
4141 | if (IS_ERR(hpriv->clk)) | 4138 | if (IS_ERR(hpriv->clk)) |