diff options
Diffstat (limited to 'drivers/scsi/sata_promise.c')
-rw-r--r-- | drivers/scsi/sata_promise.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index 7c4f6ecc1cc9..ed54f2810609 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c | |||
@@ -282,7 +282,7 @@ static void pdc_port_stop(struct ata_port *ap) | |||
282 | 282 | ||
283 | static void pdc_reset_port(struct ata_port *ap) | 283 | static void pdc_reset_port(struct ata_port *ap) |
284 | { | 284 | { |
285 | void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT; | 285 | void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT; |
286 | unsigned int i; | 286 | unsigned int i; |
287 | u32 tmp; | 287 | u32 tmp; |
288 | 288 | ||
@@ -418,7 +418,7 @@ static inline unsigned int pdc_host_intr( struct ata_port *ap, | |||
418 | u8 status; | 418 | u8 status; |
419 | unsigned int handled = 0, have_err = 0; | 419 | unsigned int handled = 0, have_err = 0; |
420 | u32 tmp; | 420 | u32 tmp; |
421 | void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_GLOBAL_CTL; | 421 | void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_GLOBAL_CTL; |
422 | 422 | ||
423 | tmp = readl(mmio); | 423 | tmp = readl(mmio); |
424 | if (tmp & PDC_ERR_MASK) { | 424 | if (tmp & PDC_ERR_MASK) { |
@@ -447,7 +447,7 @@ static inline unsigned int pdc_host_intr( struct ata_port *ap, | |||
447 | static void pdc_irq_clear(struct ata_port *ap) | 447 | static void pdc_irq_clear(struct ata_port *ap) |
448 | { | 448 | { |
449 | struct ata_host_set *host_set = ap->host_set; | 449 | struct ata_host_set *host_set = ap->host_set; |
450 | void *mmio = host_set->mmio_base; | 450 | void __iomem *mmio = host_set->mmio_base; |
451 | 451 | ||
452 | readl(mmio + PDC_INT_SEQMASK); | 452 | readl(mmio + PDC_INT_SEQMASK); |
453 | } | 453 | } |
@@ -459,7 +459,7 @@ static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *r | |||
459 | u32 mask = 0; | 459 | u32 mask = 0; |
460 | unsigned int i, tmp; | 460 | unsigned int i, tmp; |
461 | unsigned int handled = 0; | 461 | unsigned int handled = 0; |
462 | void *mmio_base; | 462 | void __iomem *mmio_base; |
463 | 463 | ||
464 | VPRINTK("ENTER\n"); | 464 | VPRINTK("ENTER\n"); |
465 | 465 | ||
@@ -581,7 +581,7 @@ static void pdc_ata_setup_port(struct ata_ioports *port, unsigned long base) | |||
581 | 581 | ||
582 | static void pdc_host_init(unsigned int chip_id, struct ata_probe_ent *pe) | 582 | static void pdc_host_init(unsigned int chip_id, struct ata_probe_ent *pe) |
583 | { | 583 | { |
584 | void *mmio = pe->mmio_base; | 584 | void __iomem *mmio = pe->mmio_base; |
585 | u32 tmp; | 585 | u32 tmp; |
586 | 586 | ||
587 | /* | 587 | /* |
@@ -624,7 +624,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e | |||
624 | static int printed_version; | 624 | static int printed_version; |
625 | struct ata_probe_ent *probe_ent = NULL; | 625 | struct ata_probe_ent *probe_ent = NULL; |
626 | unsigned long base; | 626 | unsigned long base; |
627 | void *mmio_base; | 627 | void __iomem *mmio_base; |
628 | unsigned int board_idx = (unsigned int) ent->driver_data; | 628 | unsigned int board_idx = (unsigned int) ent->driver_data; |
629 | int pci_dev_busy = 0; | 629 | int pci_dev_busy = 0; |
630 | int rc; | 630 | int rc; |