Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 368e5fbd authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Tejun Heo
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 0fe4618d

drivers/ata/sata_mv.c

+5 −8
Original line number Diff line number Diff line
@@ -4067,6 +4067,7 @@ static int mv_platform_probe(struct platform_device *pdev) 
	struct ata_host *host;

	struct mv_host_priv *hpriv;

	struct resource *res;

	void __iomem *mmio;

	int n_ports = 0, irq = 0;

	int rc;

	int port;
@@ -4085,8 +4086,9 @@ static int mv_platform_probe(struct platform_device *pdev) 
	 * Get the register base first

	 */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res == NULL)

		return -EINVAL;

	mmio = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(mmio))

		return PTR_ERR(mmio);



	/* allocate host */

	if (pdev->dev.of_node) {
@@ -4130,12 +4132,7 @@ static int mv_platform_probe(struct platform_device *pdev) 
	hpriv->board_idx = chip_soc;



	host->iomap = NULL;

	hpriv->base = devm_ioremap(&pdev->dev, res->start,

				   resource_size(res));

	if (!hpriv->base)

		return -ENOMEM;



	hpriv->base -= SATAHC0_REG_BASE;

	hpriv->base = mmio - SATAHC0_REG_BASE;



	hpriv->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(hpriv->clk))