diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/pata_octeon_cf.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_platform.c | 8 | ||||
-rw-r--r-- | drivers/ata/pata_rb532_cf.c | 2 | ||||
-rw-r--r-- | drivers/ata/sata_mv.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c index e807cc3b6ab4..d6f69561dc86 100644 --- a/drivers/ata/pata_octeon_cf.c +++ b/drivers/ata/pata_octeon_cf.c | |||
@@ -841,7 +841,7 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev) | |||
841 | ocd = pdev->dev.platform_data; | 841 | ocd = pdev->dev.platform_data; |
842 | 842 | ||
843 | cs0 = devm_ioremap_nocache(&pdev->dev, res_cs0->start, | 843 | cs0 = devm_ioremap_nocache(&pdev->dev, res_cs0->start, |
844 | res_cs0->end - res_cs0->start + 1); | 844 | resource_size(res_cs0)); |
845 | 845 | ||
846 | if (!cs0) | 846 | if (!cs0) |
847 | return -ENOMEM; | 847 | return -ENOMEM; |
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c index d8d743af3225..3f6ebc6c665a 100644 --- a/drivers/ata/pata_platform.c +++ b/drivers/ata/pata_platform.c | |||
@@ -151,14 +151,14 @@ int __devinit __pata_platform_probe(struct device *dev, | |||
151 | */ | 151 | */ |
152 | if (mmio) { | 152 | if (mmio) { |
153 | ap->ioaddr.cmd_addr = devm_ioremap(dev, io_res->start, | 153 | ap->ioaddr.cmd_addr = devm_ioremap(dev, io_res->start, |
154 | io_res->end - io_res->start + 1); | 154 | resource_size(io_res)); |
155 | ap->ioaddr.ctl_addr = devm_ioremap(dev, ctl_res->start, | 155 | ap->ioaddr.ctl_addr = devm_ioremap(dev, ctl_res->start, |
156 | ctl_res->end - ctl_res->start + 1); | 156 | resource_size(ctl_res)); |
157 | } else { | 157 | } else { |
158 | ap->ioaddr.cmd_addr = devm_ioport_map(dev, io_res->start, | 158 | ap->ioaddr.cmd_addr = devm_ioport_map(dev, io_res->start, |
159 | io_res->end - io_res->start + 1); | 159 | resource_size(io_res)); |
160 | ap->ioaddr.ctl_addr = devm_ioport_map(dev, ctl_res->start, | 160 | ap->ioaddr.ctl_addr = devm_ioport_map(dev, ctl_res->start, |
161 | ctl_res->end - ctl_res->start + 1); | 161 | resource_size(ctl_res)); |
162 | } | 162 | } |
163 | if (!ap->ioaddr.cmd_addr || !ap->ioaddr.ctl_addr) { | 163 | if (!ap->ioaddr.cmd_addr || !ap->ioaddr.ctl_addr) { |
164 | dev_err(dev, "failed to map IO/CTL base\n"); | 164 | dev_err(dev, "failed to map IO/CTL base\n"); |
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c index 8e3cdef8a25f..45f1e10f917b 100644 --- a/drivers/ata/pata_rb532_cf.c +++ b/drivers/ata/pata_rb532_cf.c | |||
@@ -151,7 +151,7 @@ static __devinit int rb532_pata_driver_probe(struct platform_device *pdev) | |||
151 | info->irq = irq; | 151 | info->irq = irq; |
152 | 152 | ||
153 | info->iobase = devm_ioremap_nocache(&pdev->dev, res->start, | 153 | info->iobase = devm_ioremap_nocache(&pdev->dev, res->start, |
154 | res->end - res->start + 1); | 154 | resource_size(res)); |
155 | if (!info->iobase) | 155 | if (!info->iobase) |
156 | return -ENOMEM; | 156 | return -ENOMEM; |
157 | 157 | ||
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index c19417e02208..17f9ff9067a2 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -4013,7 +4013,7 @@ static int mv_platform_probe(struct platform_device *pdev) | |||
4013 | 4013 | ||
4014 | host->iomap = NULL; | 4014 | host->iomap = NULL; |
4015 | hpriv->base = devm_ioremap(&pdev->dev, res->start, | 4015 | hpriv->base = devm_ioremap(&pdev->dev, res->start, |
4016 | res->end - res->start + 1); | 4016 | resource_size(res)); |
4017 | hpriv->base -= SATAHC0_REG_BASE; | 4017 | hpriv->base -= SATAHC0_REG_BASE; |
4018 | 4018 | ||
4019 | /* | 4019 | /* |