diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c index 9f63bdfb8576..c816997dc0a9 100644 --- a/drivers/ata/pata_pxa.c +++ b/drivers/ata/pata_pxa.c @@ -161,8 +161,6 @@ static int pxa_ata_probe(struct platform_device *pdev) struct ata_host *host; struct ata_port *ap; struct pata_pxa_data *data; - struct resource *cmd_res; - struct resource *ctl_res; struct resource *dma_res; struct pata_pxa_pdata *pdata = dev_get_platdata(&pdev->dev); struct dma_slave_config config; @@ -181,20 +179,6 @@ static int pxa_ata_probe(struct platform_device *pdev) return -EINVAL; } - /* - * CMD port base address - */ - cmd_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (unlikely(cmd_res == NULL)) - return -EINVAL; - - /* - * CTL port base address - */ - ctl_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (unlikely(ctl_res == NULL)) - return -EINVAL; - /* * DMA port base address */ @@ -221,14 +205,12 @@ static int pxa_ata_probe(struct platform_device *pdev) ap->pio_mask = ATA_PIO4; ap->mwdma_mask = ATA_MWDMA2; - ap->ioaddr.cmd_addr = devm_ioremap(&pdev->dev, cmd_res->start, - resource_size(cmd_res)); - if (!ap->ioaddr.cmd_addr) - return -ENOMEM; - ap->ioaddr.ctl_addr = devm_ioremap(&pdev->dev, ctl_res->start, - resource_size(ctl_res)); - if (!ap->ioaddr.ctl_addr) - return -ENOMEM; + ap->ioaddr.cmd_addr = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(ap->ioaddr.cmd_addr)) + return PTR_ERR(ap->ioaddr.cmd_addr); + ap->ioaddr.ctl_addr = devm_platform_ioremap_resource(pdev, 1); + if (IS_ERR(ap->ioaddr.ctl_addr)) + return PTR_ERR(ap->ioaddr.ctl_addr); ap->ioaddr.bmdma_addr = devm_ioremap(&pdev->dev, dma_res->start, resource_size(dma_res)); if (!ap->ioaddr.bmdma_addr)