aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-disk.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-disk.c')
-rw-r--r--drivers/ide/ide-disk.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index b1781908e1f2..322c4691836a 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -138,7 +138,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
138 ide_hwif_t *hwif = HWIF(drive); 138 ide_hwif_t *hwif = HWIF(drive);
139 unsigned int dma = drive->using_dma; 139 unsigned int dma = drive->using_dma;
140 u8 lba48 = (drive->addressing == 1) ? 1 : 0; 140 u8 lba48 = (drive->addressing == 1) ? 1 : 0;
141 task_ioreg_t command = WIN_NOP; 141 u8 command = WIN_NOP;
142 ata_nsector_t nsectors; 142 ata_nsector_t nsectors;
143 143
144 nsectors.all = (u16) rq->nr_sectors; 144 nsectors.all = (u16) rq->nr_sectors;
@@ -162,7 +162,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
162 162
163 if (drive->select.b.lba) { 163 if (drive->select.b.lba) {
164 if (lba48) { 164 if (lba48) {
165 task_ioreg_t tasklets[10]; 165 u8 tasklets[10];
166 166
167 pr_debug("%s: LBA=0x%012llx\n", drive->name, 167 pr_debug("%s: LBA=0x%012llx\n", drive->name,
168 (unsigned long long)block); 168 (unsigned long long)block);
@@ -171,16 +171,16 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
171 tasklets[1] = 0; 171 tasklets[1] = 0;
172 tasklets[2] = nsectors.b.low; 172 tasklets[2] = nsectors.b.low;
173 tasklets[3] = nsectors.b.high; 173 tasklets[3] = nsectors.b.high;
174 tasklets[4] = (task_ioreg_t) block; 174 tasklets[4] = (u8) block;
175 tasklets[5] = (task_ioreg_t) (block>>8); 175 tasklets[5] = (u8)(block >> 8);
176 tasklets[6] = (task_ioreg_t) (block>>16); 176 tasklets[6] = (u8)(block >> 16);
177 tasklets[7] = (task_ioreg_t) (block>>24); 177 tasklets[7] = (u8)(block >> 24);
178 if (sizeof(block) == 4) { 178 if (sizeof(block) == 4) {
179 tasklets[8] = (task_ioreg_t) 0; 179 tasklets[8] = 0;
180 tasklets[9] = (task_ioreg_t) 0; 180 tasklets[9] = 0;
181 } else { 181 } else {
182 tasklets[8] = (task_ioreg_t)((u64)block >> 32); 182 tasklets[8] = (u8)((u64)block >> 32);
183 tasklets[9] = (task_ioreg_t)((u64)block >> 40); 183 tasklets[9] = (u8)((u64)block >> 40);
184 } 184 }
185#ifdef DEBUG 185#ifdef DEBUG
186 printk("%s: 0x%02x%02x 0x%02x%02x%02x%02x%02x%02x\n", 186 printk("%s: 0x%02x%02x 0x%02x%02x%02x%02x%02x%02x\n",