aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/ahci.c33
-rw-r--r--drivers/scsi/ata_piix.c2
-rw-r--r--drivers/scsi/sata_promise.c12
-rw-r--r--drivers/scsi/sata_sil.c5
-rw-r--r--drivers/scsi/sata_svw.c2
-rw-r--r--drivers/scsi/sata_sx4.c39
6 files changed, 48 insertions, 45 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 46e5f186d55a..4cfb257a0f67 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -294,9 +294,9 @@ static inline unsigned long ahci_port_base_ul (unsigned long base, unsigned int
294 return base + 0x100 + (port * 0x80); 294 return base + 0x100 + (port * 0x80);
295} 295}
296 296
297static inline void *ahci_port_base (void *base, unsigned int port) 297static inline void __iomem *ahci_port_base (void __iomem *base, unsigned int port)
298{ 298{
299 return (void *) ahci_port_base_ul((unsigned long)base, port); 299 return (void __iomem *) ahci_port_base_ul((unsigned long)base, port);
300} 300}
301 301
302static int ahci_port_start(struct ata_port *ap) 302static int ahci_port_start(struct ata_port *ap)
@@ -304,8 +304,9 @@ static int ahci_port_start(struct ata_port *ap)
304 struct device *dev = ap->host_set->dev; 304 struct device *dev = ap->host_set->dev;
305 struct ahci_host_priv *hpriv = ap->host_set->private_data; 305 struct ahci_host_priv *hpriv = ap->host_set->private_data;
306 struct ahci_port_priv *pp; 306 struct ahci_port_priv *pp;
307 void *mem, *mmio = ap->host_set->mmio_base; 307 void __iomem *mmio = ap->host_set->mmio_base;
308 void *port_mmio = ahci_port_base(mmio, ap->port_no); 308 void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
309 void *mem;
309 dma_addr_t mem_dma; 310 dma_addr_t mem_dma;
310 311
311 pp = kmalloc(sizeof(*pp), GFP_KERNEL); 312 pp = kmalloc(sizeof(*pp), GFP_KERNEL);
@@ -373,8 +374,8 @@ static void ahci_port_stop(struct ata_port *ap)
373{ 374{
374 struct device *dev = ap->host_set->dev; 375 struct device *dev = ap->host_set->dev;
375 struct ahci_port_priv *pp = ap->private_data; 376 struct ahci_port_priv *pp = ap->private_data;
376 void *mmio = ap->host_set->mmio_base; 377 void __iomem *mmio = ap->host_set->mmio_base;
377 void *port_mmio = ahci_port_base(mmio, ap->port_no); 378 void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
378 u32 tmp; 379 u32 tmp;
379 380
380 tmp = readl(port_mmio + PORT_CMD); 381 tmp = readl(port_mmio + PORT_CMD);
@@ -536,8 +537,8 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)
536 537
537static void ahci_intr_error(struct ata_port *ap, u32 irq_stat) 538static void ahci_intr_error(struct ata_port *ap, u32 irq_stat)
538{ 539{
539 void *mmio = ap->host_set->mmio_base; 540 void __iomem *mmio = ap->host_set->mmio_base;
540 void *port_mmio = ahci_port_base(mmio, ap->port_no); 541 void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
541 u32 tmp; 542 u32 tmp;
542 int work; 543 int work;
543 544
@@ -585,8 +586,8 @@ static void ahci_intr_error(struct ata_port *ap, u32 irq_stat)
585static void ahci_eng_timeout(struct ata_port *ap) 586static void ahci_eng_timeout(struct ata_port *ap)
586{ 587{
587 struct ata_host_set *host_set = ap->host_set; 588 struct ata_host_set *host_set = ap->host_set;
588 void *mmio = host_set->mmio_base; 589 void __iomem *mmio = host_set->mmio_base;
589 void *port_mmio = ahci_port_base(mmio, ap->port_no); 590 void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
590 struct ata_queued_cmd *qc; 591 struct ata_queued_cmd *qc;
591 unsigned long flags; 592 unsigned long flags;
592 593
@@ -616,8 +617,8 @@ static void ahci_eng_timeout(struct ata_port *ap)
616 617
617static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc) 618static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
618{ 619{
619 void *mmio = ap->host_set->mmio_base; 620 void __iomem *mmio = ap->host_set->mmio_base;
620 void *port_mmio = ahci_port_base(mmio, ap->port_no); 621 void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
621 u32 status, serr, ci; 622 u32 status, serr, ci;
622 623
623 serr = readl(port_mmio + PORT_SCR_ERR); 624 serr = readl(port_mmio + PORT_SCR_ERR);
@@ -653,7 +654,7 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *
653 struct ata_host_set *host_set = dev_instance; 654 struct ata_host_set *host_set = dev_instance;
654 struct ahci_host_priv *hpriv; 655 struct ahci_host_priv *hpriv;
655 unsigned int i, handled = 0; 656 unsigned int i, handled = 0;
656 void *mmio; 657 void __iomem *mmio;
657 u32 irq_stat, irq_ack = 0; 658 u32 irq_stat, irq_ack = 0;
658 659
659 VPRINTK("ENTER\n"); 660 VPRINTK("ENTER\n");
@@ -699,7 +700,7 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *
699static int ahci_qc_issue(struct ata_queued_cmd *qc) 700static int ahci_qc_issue(struct ata_queued_cmd *qc)
700{ 701{
701 struct ata_port *ap = qc->ap; 702 struct ata_port *ap = qc->ap;
702 void *port_mmio = (void *) ap->ioaddr.cmd_addr; 703 void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
703 704
704 writel(1, port_mmio + PORT_CMD_ISSUE); 705 writel(1, port_mmio + PORT_CMD_ISSUE);
705 readl(port_mmio + PORT_CMD_ISSUE); /* flush */ 706 readl(port_mmio + PORT_CMD_ISSUE); /* flush */
@@ -884,7 +885,7 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent)
884{ 885{
885 struct ahci_host_priv *hpriv = probe_ent->private_data; 886 struct ahci_host_priv *hpriv = probe_ent->private_data;
886 struct pci_dev *pdev = to_pci_dev(probe_ent->dev); 887 struct pci_dev *pdev = to_pci_dev(probe_ent->dev);
887 void *mmio = probe_ent->mmio_base; 888 void __iomem *mmio = probe_ent->mmio_base;
888 u32 vers, cap, impl, speed; 889 u32 vers, cap, impl, speed;
889 const char *speed_s; 890 const char *speed_s;
890 u16 cc; 891 u16 cc;
@@ -957,7 +958,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
957 struct ata_probe_ent *probe_ent = NULL; 958 struct ata_probe_ent *probe_ent = NULL;
958 struct ahci_host_priv *hpriv; 959 struct ahci_host_priv *hpriv;
959 unsigned long base; 960 unsigned long base;
960 void *mmio_base; 961 void __iomem *mmio_base;
961 unsigned int board_idx = (unsigned int) ent->driver_data; 962 unsigned int board_idx = (unsigned int) ent->driver_data;
962 int have_msi, pci_dev_busy = 0; 963 int have_msi, pci_dev_busy = 0;
963 int rc; 964 int rc;
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index fb28c1261848..90c53b88a1ee 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -583,7 +583,7 @@ static void pci_enable_intx(struct pci_dev *pdev)
583#define AHCI_ENABLE (1 << 31) 583#define AHCI_ENABLE (1 << 31)
584static int piix_disable_ahci(struct pci_dev *pdev) 584static int piix_disable_ahci(struct pci_dev *pdev)
585{ 585{
586 void *mmio; 586 void __iomem *mmio;
587 unsigned long addr; 587 unsigned long addr;
588 u32 tmp; 588 u32 tmp;
589 int rc = 0; 589 int rc = 0;
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
283static void pdc_reset_port(struct ata_port *ap) 283static 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,
447static void pdc_irq_clear(struct ata_port *ap) 447static 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
582static void pdc_host_init(unsigned int chip_id, struct ata_probe_ent *pe) 582static 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;
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 71d49548f0a3..b1a696fcec81 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -242,7 +242,8 @@ static void sil_post_set_mode (struct ata_port *ap)
242{ 242{
243 struct ata_host_set *host_set = ap->host_set; 243 struct ata_host_set *host_set = ap->host_set;
244 struct ata_device *dev; 244 struct ata_device *dev;
245 void *addr = host_set->mmio_base + sil_port[ap->port_no].xfer_mode; 245 void __iomem *addr =
246 host_set->mmio_base + sil_port[ap->port_no].xfer_mode;
246 u32 tmp, dev_mode[2]; 247 u32 tmp, dev_mode[2];
247 unsigned int i; 248 unsigned int i;
248 249
@@ -375,7 +376,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
375 static int printed_version; 376 static int printed_version;
376 struct ata_probe_ent *probe_ent = NULL; 377 struct ata_probe_ent *probe_ent = NULL;
377 unsigned long base; 378 unsigned long base;
378 void *mmio_base; 379 void __iomem *mmio_base;
379 int rc; 380 int rc;
380 unsigned int i; 381 unsigned int i;
381 int pci_dev_busy = 0; 382 int pci_dev_busy = 0;
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 19d3bb3b0fb6..d48de9547fb3 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -346,7 +346,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
346 static int printed_version; 346 static int printed_version;
347 struct ata_probe_ent *probe_ent = NULL; 347 struct ata_probe_ent *probe_ent = NULL;
348 unsigned long base; 348 unsigned long base;
349 void *mmio_base; 349 void __iomem *mmio_base;
350 int pci_dev_busy = 0; 350 int pci_dev_busy = 0;
351 int rc; 351 int rc;
352 int i; 352 int i;
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index c72fcc46f0fa..38b3dd2d7504 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -451,9 +451,9 @@ static void pdc20621_dma_prep(struct ata_queued_cmd *qc)
451 struct scatterlist *sg = qc->sg; 451 struct scatterlist *sg = qc->sg;
452 struct ata_port *ap = qc->ap; 452 struct ata_port *ap = qc->ap;
453 struct pdc_port_priv *pp = ap->private_data; 453 struct pdc_port_priv *pp = ap->private_data;
454 void *mmio = ap->host_set->mmio_base; 454 void __iomem *mmio = ap->host_set->mmio_base;
455 struct pdc_host_priv *hpriv = ap->host_set->private_data; 455 struct pdc_host_priv *hpriv = ap->host_set->private_data;
456 void *dimm_mmio = hpriv->dimm_mmio; 456 void __iomem *dimm_mmio = hpriv->dimm_mmio;
457 unsigned int portno = ap->port_no; 457 unsigned int portno = ap->port_no;
458 unsigned int i, last, idx, total_len = 0, sgt_len; 458 unsigned int i, last, idx, total_len = 0, sgt_len;
459 u32 *buf = (u32 *) &pp->dimm_buf[PDC_DIMM_HEADER_SZ]; 459 u32 *buf = (u32 *) &pp->dimm_buf[PDC_DIMM_HEADER_SZ];
@@ -513,9 +513,9 @@ static void pdc20621_nodata_prep(struct ata_queued_cmd *qc)
513{ 513{
514 struct ata_port *ap = qc->ap; 514 struct ata_port *ap = qc->ap;
515 struct pdc_port_priv *pp = ap->private_data; 515 struct pdc_port_priv *pp = ap->private_data;
516 void *mmio = ap->host_set->mmio_base; 516 void __iomem *mmio = ap->host_set->mmio_base;
517 struct pdc_host_priv *hpriv = ap->host_set->private_data; 517 struct pdc_host_priv *hpriv = ap->host_set->private_data;
518 void *dimm_mmio = hpriv->dimm_mmio; 518 void __iomem *dimm_mmio = hpriv->dimm_mmio;
519 unsigned int portno = ap->port_no; 519 unsigned int portno = ap->port_no;
520 unsigned int i; 520 unsigned int i;
521 521
@@ -565,7 +565,7 @@ static void __pdc20621_push_hdma(struct ata_queued_cmd *qc,
565{ 565{
566 struct ata_port *ap = qc->ap; 566 struct ata_port *ap = qc->ap;
567 struct ata_host_set *host_set = ap->host_set; 567 struct ata_host_set *host_set = ap->host_set;
568 void *mmio = host_set->mmio_base; 568 void __iomem *mmio = host_set->mmio_base;
569 569
570 /* hard-code chip #0 */ 570 /* hard-code chip #0 */
571 mmio += PDC_CHIP0_OFS; 571 mmio += PDC_CHIP0_OFS;
@@ -639,7 +639,7 @@ static void pdc20621_packet_start(struct ata_queued_cmd *qc)
639 struct ata_port *ap = qc->ap; 639 struct ata_port *ap = qc->ap;
640 struct ata_host_set *host_set = ap->host_set; 640 struct ata_host_set *host_set = ap->host_set;
641 unsigned int port_no = ap->port_no; 641 unsigned int port_no = ap->port_no;
642 void *mmio = host_set->mmio_base; 642 void __iomem *mmio = host_set->mmio_base;
643 unsigned int rw = (qc->tf.flags & ATA_TFLAG_WRITE); 643 unsigned int rw = (qc->tf.flags & ATA_TFLAG_WRITE);
644 u8 seq = (u8) (port_no + 1); 644 u8 seq = (u8) (port_no + 1);
645 unsigned int port_ofs; 645 unsigned int port_ofs;
@@ -699,7 +699,7 @@ static int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc)
699static inline unsigned int pdc20621_host_intr( struct ata_port *ap, 699static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
700 struct ata_queued_cmd *qc, 700 struct ata_queued_cmd *qc,
701 unsigned int doing_hdma, 701 unsigned int doing_hdma,
702 void *mmio) 702 void __iomem *mmio)
703{ 703{
704 unsigned int port_no = ap->port_no; 704 unsigned int port_no = ap->port_no;
705 unsigned int port_ofs = 705 unsigned int port_ofs =
@@ -778,7 +778,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
778static void pdc20621_irq_clear(struct ata_port *ap) 778static void pdc20621_irq_clear(struct ata_port *ap)
779{ 779{
780 struct ata_host_set *host_set = ap->host_set; 780 struct ata_host_set *host_set = ap->host_set;
781 void *mmio = host_set->mmio_base; 781 void __iomem *mmio = host_set->mmio_base;
782 782
783 mmio += PDC_CHIP0_OFS; 783 mmio += PDC_CHIP0_OFS;
784 784
@@ -792,7 +792,7 @@ static irqreturn_t pdc20621_interrupt (int irq, void *dev_instance, struct pt_re
792 u32 mask = 0; 792 u32 mask = 0;
793 unsigned int i, tmp, port_no; 793 unsigned int i, tmp, port_no;
794 unsigned int handled = 0; 794 unsigned int handled = 0;
795 void *mmio_base; 795 void __iomem *mmio_base;
796 796
797 VPRINTK("ENTER\n"); 797 VPRINTK("ENTER\n");
798 798
@@ -940,9 +940,9 @@ static void pdc20621_get_from_dimm(struct ata_probe_ent *pe, void *psource,
940 u16 idx; 940 u16 idx;
941 u8 page_mask; 941 u8 page_mask;
942 long dist; 942 long dist;
943 void *mmio = pe->mmio_base; 943 void __iomem *mmio = pe->mmio_base;
944 struct pdc_host_priv *hpriv = pe->private_data; 944 struct pdc_host_priv *hpriv = pe->private_data;
945 void *dimm_mmio = hpriv->dimm_mmio; 945 void __iomem *dimm_mmio = hpriv->dimm_mmio;
946 946
947 /* hard-code chip #0 */ 947 /* hard-code chip #0 */
948 mmio += PDC_CHIP0_OFS; 948 mmio += PDC_CHIP0_OFS;
@@ -996,9 +996,9 @@ static void pdc20621_put_to_dimm(struct ata_probe_ent *pe, void *psource,
996 u16 idx; 996 u16 idx;
997 u8 page_mask; 997 u8 page_mask;
998 long dist; 998 long dist;
999 void *mmio = pe->mmio_base; 999 void __iomem *mmio = pe->mmio_base;
1000 struct pdc_host_priv *hpriv = pe->private_data; 1000 struct pdc_host_priv *hpriv = pe->private_data;
1001 void *dimm_mmio = hpriv->dimm_mmio; 1001 void __iomem *dimm_mmio = hpriv->dimm_mmio;
1002 1002
1003 /* hard-code chip #0 */ 1003 /* hard-code chip #0 */
1004 mmio += PDC_CHIP0_OFS; 1004 mmio += PDC_CHIP0_OFS;
@@ -1044,7 +1044,7 @@ static void pdc20621_put_to_dimm(struct ata_probe_ent *pe, void *psource,
1044static unsigned int pdc20621_i2c_read(struct ata_probe_ent *pe, u32 device, 1044static unsigned int pdc20621_i2c_read(struct ata_probe_ent *pe, u32 device,
1045 u32 subaddr, u32 *pdata) 1045 u32 subaddr, u32 *pdata)
1046{ 1046{
1047 void *mmio = pe->mmio_base; 1047 void __iomem *mmio = pe->mmio_base;
1048 u32 i2creg = 0; 1048 u32 i2creg = 0;
1049 u32 status; 1049 u32 status;
1050 u32 count =0; 1050 u32 count =0;
@@ -1103,7 +1103,7 @@ static int pdc20621_prog_dimm0(struct ata_probe_ent *pe)
1103 u32 data = 0; 1103 u32 data = 0;
1104 int size, i; 1104 int size, i;
1105 u8 bdimmsize; 1105 u8 bdimmsize;
1106 void *mmio = pe->mmio_base; 1106 void __iomem *mmio = pe->mmio_base;
1107 static const struct { 1107 static const struct {
1108 unsigned int reg; 1108 unsigned int reg;
1109 unsigned int ofs; 1109 unsigned int ofs;
@@ -1166,7 +1166,7 @@ static unsigned int pdc20621_prog_dimm_global(struct ata_probe_ent *pe)
1166{ 1166{
1167 u32 data, spd0; 1167 u32 data, spd0;
1168 int error, i; 1168 int error, i;
1169 void *mmio = pe->mmio_base; 1169 void __iomem *mmio = pe->mmio_base;
1170 1170
1171 /* hard-code chip #0 */ 1171 /* hard-code chip #0 */
1172 mmio += PDC_CHIP0_OFS; 1172 mmio += PDC_CHIP0_OFS;
@@ -1220,7 +1220,7 @@ static unsigned int pdc20621_dimm_init(struct ata_probe_ent *pe)
1220 u32 ticks=0; 1220 u32 ticks=0;
1221 u32 clock=0; 1221 u32 clock=0;
1222 u32 fparam=0; 1222 u32 fparam=0;
1223 void *mmio = pe->mmio_base; 1223 void __iomem *mmio = pe->mmio_base;
1224 1224
1225 /* hard-code chip #0 */ 1225 /* hard-code chip #0 */
1226 mmio += PDC_CHIP0_OFS; 1226 mmio += PDC_CHIP0_OFS;
@@ -1344,7 +1344,7 @@ static unsigned int pdc20621_dimm_init(struct ata_probe_ent *pe)
1344static void pdc_20621_init(struct ata_probe_ent *pe) 1344static void pdc_20621_init(struct ata_probe_ent *pe)
1345{ 1345{
1346 u32 tmp; 1346 u32 tmp;
1347 void *mmio = pe->mmio_base; 1347 void __iomem *mmio = pe->mmio_base;
1348 1348
1349 /* hard-code chip #0 */ 1349 /* hard-code chip #0 */
1350 mmio += PDC_CHIP0_OFS; 1350 mmio += PDC_CHIP0_OFS;
@@ -1377,7 +1377,8 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
1377 static int printed_version; 1377 static int printed_version;
1378 struct ata_probe_ent *probe_ent = NULL; 1378 struct ata_probe_ent *probe_ent = NULL;
1379 unsigned long base; 1379 unsigned long base;
1380 void *mmio_base, *dimm_mmio = NULL; 1380 void __iomem *mmio_base;
1381 void __iomem *dimm_mmio = NULL;
1381 struct pdc_host_priv *hpriv = NULL; 1382 struct pdc_host_priv *hpriv = NULL;
1382 unsigned int board_idx = (unsigned int) ent->driver_data; 1383 unsigned int board_idx = (unsigned int) ent->driver_data;
1383 int pci_dev_busy = 0; 1384 int pci_dev_busy = 0;