scsi: fix compiler-warning for sata_vsc.c
PATCH 1/1 scsi: fix compiler-warning for sata_vsc.c
From: Richard Knutsson <[email protected]>
Fix compiler-warning "... makes pointer from integer without a cast".
---
Jeremy Higdon, sorry but I couldn't find your mail-address.
sata_vsc.c | 67 ++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 36 insertions(+), 31 deletions(-)
drivers/scsi/sata_vsc.c +0 -0
@@ -130,21 +130,26 @@ static void vsc_sata_tf_load(struct ata_
vsc_intr_mask_update(ap, tf->ctl & ATA_NIEN);
}
if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
- writew(tf->feature | (((u16)tf->hob_feature) << 8), ioaddr->feature_addr);
- writew(tf->nsect | (((u16)tf->hob_nsect) << 8), ioaddr->nsect_addr);
- writew(tf->lbal | (((u16)tf->hob_lbal) << 8), ioaddr->lbal_addr);
- writew(tf->lbam | (((u16)tf->hob_lbam) << 8), ioaddr->lbam_addr);
- writew(tf->lbah | (((u16)tf->hob_lbah) << 8), ioaddr->lbah_addr);+ writew(tf->feature | (((u16)tf->hob_feature) << 8),
+ (void *) ioaddr->feature_addr);
+ writew(tf->nsect | (((u16)tf->hob_nsect) << 8),
+ (void *) ioaddr->nsect_addr);
+ writew(tf->lbal | (((u16)tf->hob_lbal) << 8),
+ (void *) ioaddr->lbal_addr);
+ writew(tf->lbam | (((u16)tf->hob_lbam) << 8),
+ (void *) ioaddr->lbam_addr);
+ writew(tf->lbah | (((u16)tf->hob_lbah) << 8),
+ (void *) ioaddr->lbah_addr);
} else if (is_addr) {- writew(tf->feature, ioaddr->feature_addr);
- writew(tf->nsect, ioaddr->nsect_addr);
- writew(tf->lbal, ioaddr->lbal_addr);
- writew(tf->lbam, ioaddr->lbam_addr);
- writew(tf->lbah, ioaddr->lbah_addr);
+ writew(tf->feature, (void *) ioaddr->feature_addr);
+ writew(tf->nsect, (void *) ioaddr->nsect_addr);
+ writew(tf->lbal, (void *) ioaddr->lbal_addr);
+ writew(tf->lbam, (void *) ioaddr->lbam_addr);
+ writew(tf->lbah, (void *) ioaddr->lbah_addr); } if (tf->flags & ATA_TFLAG_DEVICE)
- writeb(tf->device, ioaddr->device_addr);
+ writeb(tf->device, (void *) ioaddr->device_addr);
ata_wait_idle(ap); } @@ -155,26 +160,26 @@ static void vsc_sata_tf_read(struct ata_ struct ata_ioports *ioaddr = &ap->ioaddr; u16 nsect, lbal, lbam, lbah, feature;
- tf->command = ata_check_status(ap);
- tf->device = readw(ioaddr->device_addr);
- feature = readw(ioaddr->error_addr);
- nsect = readw(ioaddr->nsect_addr);
- lbal = readw(ioaddr->lbal_addr);
- lbam = readw(ioaddr->lbam_addr);
- lbah = readw(ioaddr->lbah_addr);
-
- tf->feature = feature;
- tf->nsect = nsect;
- tf->lbal = lbal;
- tf->lbam = lbam;
- tf->lbah = lbah;
+ tf->command = ata_check_status(ap);
+ tf->device = readw((void *) ioaddr->device_addr);
+ feature = readw((void *) ioaddr->error_addr);
+ nsect = readw((void *) ioaddr->nsect_addr);
+ lbal = readw((void *) ioaddr->lbal_addr);
+ lbam = readw((void *) ioaddr->lbam_addr);
+ lbah = readw((void *) ioaddr->lbah_addr);
+
+ tf->feature = feature;
+ tf->nsect = nsect;
+ tf->lbal = lbal;
+ tf->lbam = lbam;
+ tf->lbah = lbah;
if (tf->flags & ATA_TFLAG_LBA48) {- tf->hob_feature = feature >> 8;
- tf->hob_nsect = nsect >> 8;
- tf->hob_lbal = lbal >> 8;
- tf->hob_lbam = lbam >> 8;
- tf->hob_lbah = lbah >> 8;
+ tf->hob_feature = feature >> 8;
+ tf->hob_nsect = nsect >> 8;
+ tf->hob_lbal = lbal >> 8;
+ tf->hob_lbam = lbam >> 8;
+ tf->hob_lbah = lbah >> 8;
}
}@@ -280,8 +285,8 @@ static void __devinit vsc_sata_setup_por
port->ctl_addr = base + VSC_SATA_TF_CTL_OFFSET; port->bmdma_addr = base + VSC_SATA_DMA_CMD_OFFSET; port->scr_addr = base + VSC_SATA_SCR_STATUS_OFFSET;
- writel(0, base + VSC_SATA_UP_DESCRIPTOR_OFFSET);
- writel(0, base + VSC_SATA_UP_DATA_BUFFER_OFFSET);
+ writel(0, (void *) base + VSC_SATA_UP_DESCRIPTOR_OFFSET);
+ writel(0, (void *) base + VSC_SATA_UP_DATA_BUFFER_OFFSET);
}
Jeff Garzik
NAKQuoted 7 lines · Richard Knutsson
From: Richard Knutsson <[email protected]>
Fix compiler-warning "... makes pointer from integer without a cast".
Signed-off-by Richard Knutsson <[email protected]>---
Jeremy Higdon, sorry but I couldn't find your mail-address.
NAK, check the archives and fix the real problem.
Jeff