Use the new helper that wraps the calls to platform_get_resource() and devm_ioremap_resource() together. Signed-off-by: Enrico Weigelt, metux IT consult <info@xxxxxxxxx> --- drivers/ata/ahci_tegra.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/ata/ahci_tegra.c b/drivers/ata/ahci_tegra.c index 004f260..88748ca 100644 --- a/drivers/ata/ahci_tegra.c +++ b/drivers/ata/ahci_tegra.c @@ -490,7 +490,6 @@ static int tegra_ahci_probe(struct platform_device *pdev) { struct ahci_host_priv *hpriv; struct tegra_ahci_priv *tegra; - struct resource *res; int ret; unsigned int i; @@ -507,19 +506,17 @@ static int tegra_ahci_probe(struct platform_device *pdev) tegra->pdev = pdev; tegra->soc = of_device_get_match_data(&pdev->dev); - res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - tegra->sata_regs = devm_ioremap_resource(&pdev->dev, res); + tegra->sata_regs = devm_platform_ioremap_resource(pdev, 1); if (IS_ERR(tegra->sata_regs)) return PTR_ERR(tegra->sata_regs); /* * AUX registers is optional. */ - res = platform_get_resource(pdev, IORESOURCE_MEM, 2); - if (res) { - tegra->sata_aux_regs = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(tegra->sata_aux_regs)) - return PTR_ERR(tegra->sata_aux_regs); + tegra->sata_aux_regs = devm_platform_ioremap_resource(pdev, 2); + if (IS_ERR(tegra->sata_aux_regs)) { + dev_info(&pdev->dev, "Cant get aux registers (optional)"); + tegra->sata_aux_regs = NULL; } tegra->sata_rst = devm_reset_control_get(&pdev->dev, "sata"); -- 1.9.1