aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cdrom/gdrom.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/cdrom/gdrom.c')
-rw-r--r--drivers/cdrom/gdrom.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index a762283d2a21..e789e6c9a422 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -214,7 +214,7 @@ static void gdrom_spicommand(void *spi_string, int buflen)
214 gdrom_getsense(NULL); 214 gdrom_getsense(NULL);
215 return; 215 return;
216 } 216 }
217 outsw(PHYSADDR(GDROM_DATA_REG), cmd, 6); 217 outsw(GDROM_DATA_REG, cmd, 6);
218} 218}
219 219
220 220
@@ -298,7 +298,7 @@ static int gdrom_readtoc_cmd(struct gdromtoc *toc, int session)
298 err = -EINVAL; 298 err = -EINVAL;
299 goto cleanup_readtoc; 299 goto cleanup_readtoc;
300 } 300 }
301 insw(PHYSADDR(GDROM_DATA_REG), toc, tocsize/2); 301 insw(GDROM_DATA_REG, toc, tocsize/2);
302 if (gd.status & 0x01) 302 if (gd.status & 0x01)
303 err = -EINVAL; 303 err = -EINVAL;
304 304
@@ -449,7 +449,7 @@ static int gdrom_getsense(short *bufstring)
449 GDROM_DEFAULT_TIMEOUT); 449 GDROM_DEFAULT_TIMEOUT);
450 if (gd.pending) 450 if (gd.pending)
451 goto cleanup_sense; 451 goto cleanup_sense;
452 insw(PHYSADDR(GDROM_DATA_REG), &sense, sense_command->buflen/2); 452 insw(GDROM_DATA_REG, &sense, sense_command->buflen/2);
453 if (sense[1] & 40) { 453 if (sense[1] & 40) {
454 printk(KERN_INFO "GDROM: Drive not ready - command aborted\n"); 454 printk(KERN_INFO "GDROM: Drive not ready - command aborted\n");
455 goto cleanup_sense; 455 goto cleanup_sense;
@@ -586,7 +586,7 @@ static void gdrom_readdisk_dma(struct work_struct *work)
586 spin_unlock(&gdrom_lock); 586 spin_unlock(&gdrom_lock);
587 block = blk_rq_pos(req)/GD_TO_BLK + GD_SESSION_OFFSET; 587 block = blk_rq_pos(req)/GD_TO_BLK + GD_SESSION_OFFSET;
588 block_cnt = blk_rq_sectors(req)/GD_TO_BLK; 588 block_cnt = blk_rq_sectors(req)/GD_TO_BLK;
589 ctrl_outl(PHYSADDR(req->buffer), GDROM_DMA_STARTADDR_REG); 589 ctrl_outl(virt_to_phys(req->buffer), GDROM_DMA_STARTADDR_REG);
590 ctrl_outl(block_cnt * GDROM_HARD_SECTOR, GDROM_DMA_LENGTH_REG); 590 ctrl_outl(block_cnt * GDROM_HARD_SECTOR, GDROM_DMA_LENGTH_REG);
591 ctrl_outl(1, GDROM_DMA_DIRECTION_REG); 591 ctrl_outl(1, GDROM_DMA_DIRECTION_REG);
592 ctrl_outl(1, GDROM_DMA_ENABLE_REG); 592 ctrl_outl(1, GDROM_DMA_ENABLE_REG);
@@ -615,7 +615,7 @@ static void gdrom_readdisk_dma(struct work_struct *work)
615 cpu_relax(); 615 cpu_relax();
616 gd.pending = 1; 616 gd.pending = 1;
617 gd.transfer = 1; 617 gd.transfer = 1;
618 outsw(PHYSADDR(GDROM_DATA_REG), &read_command->cmd, 6); 618 outsw(GDROM_DATA_REG, &read_command->cmd, 6);
619 timeout = jiffies + HZ / 2; 619 timeout = jiffies + HZ / 2;
620 /* Wait for any pending DMA to finish */ 620 /* Wait for any pending DMA to finish */
621 while (ctrl_inb(GDROM_DMA_STATUS_REG) && 621 while (ctrl_inb(GDROM_DMA_STATUS_REG) &&