mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 21:51:40 +00:00
[PATCH] ide-cd: remove write-only cmd field from struct cdrom_info
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
7b4df9ece9
commit
0afaa4fc4a
@ -1292,7 +1292,6 @@ static ide_startstop_t cdrom_start_seek (ide_drive_t *drive, unsigned int block)
|
||||
struct cdrom_info *info = drive->driver_data;
|
||||
|
||||
info->dma = 0;
|
||||
info->cmd = 0;
|
||||
info->start_seek = jiffies;
|
||||
return cdrom_start_packet_command(drive, 0, cdrom_start_seek_continuation);
|
||||
}
|
||||
@ -1344,8 +1343,6 @@ static ide_startstop_t cdrom_start_read (ide_drive_t *drive, unsigned int block)
|
||||
(rq->nr_sectors & (sectors_per_frame - 1)))
|
||||
info->dma = 0;
|
||||
|
||||
info->cmd = READ;
|
||||
|
||||
/* Start sending the read request to the drive. */
|
||||
return cdrom_start_packet_command(drive, 32768, cdrom_start_read_continuation);
|
||||
}
|
||||
@ -1484,7 +1481,6 @@ static ide_startstop_t cdrom_do_packet_command (ide_drive_t *drive)
|
||||
struct cdrom_info *info = drive->driver_data;
|
||||
|
||||
info->dma = 0;
|
||||
info->cmd = 0;
|
||||
rq->flags &= ~REQ_FAILED;
|
||||
len = rq->data_len;
|
||||
|
||||
@ -1891,7 +1887,6 @@ static ide_startstop_t cdrom_start_write(ide_drive_t *drive, struct request *rq)
|
||||
/* use dma, if possible. we don't need to check more, since we
|
||||
* know that the transfer is always (at least!) frame aligned */
|
||||
info->dma = drive->using_dma ? 1 : 0;
|
||||
info->cmd = WRITE;
|
||||
|
||||
info->devinfo.media_written = 1;
|
||||
|
||||
@ -1916,7 +1911,6 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
|
||||
rq->flags |= REQ_QUIET;
|
||||
|
||||
info->dma = 0;
|
||||
info->cmd = 0;
|
||||
|
||||
/*
|
||||
* sg request
|
||||
@ -1925,7 +1919,6 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
|
||||
int mask = drive->queue->dma_alignment;
|
||||
unsigned long addr = (unsigned long) page_address(bio_page(rq->bio));
|
||||
|
||||
info->cmd = rq_data_dir(rq);
|
||||
info->dma = drive->using_dma;
|
||||
|
||||
/*
|
||||
|
@ -480,7 +480,6 @@ struct cdrom_info {
|
||||
|
||||
struct request request_sense_request;
|
||||
int dma;
|
||||
int cmd;
|
||||
unsigned long last_block;
|
||||
unsigned long start_seek;
|
||||
/* Buffer to hold mechanism status and changer slot table. */
|
||||
|
Loading…
Reference in New Issue
Block a user