Browse Source

[PATCH] ide-cd: remove write-only cmd field from struct cdrom_info

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Bartlomiej Zolnierkiewicz 19 years ago
parent
commit
0afaa4fc4a
2 changed files with 0 additions and 8 deletions
  1. 0 7
      drivers/ide/ide-cd.c
  2. 0 1
      drivers/ide/ide-cd.h

+ 0 - 7
drivers/ide/ide-cd.c

@@ -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;
 	struct cdrom_info *info = drive->driver_data;
 
 
 	info->dma = 0;
 	info->dma = 0;
-	info->cmd = 0;
 	info->start_seek = jiffies;
 	info->start_seek = jiffies;
 	return cdrom_start_packet_command(drive, 0, cdrom_start_seek_continuation);
 	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)))
 	    (rq->nr_sectors & (sectors_per_frame - 1)))
 		info->dma = 0;
 		info->dma = 0;
 
 
-	info->cmd = READ;
-
 	/* Start sending the read request to the drive. */
 	/* Start sending the read request to the drive. */
 	return cdrom_start_packet_command(drive, 32768, cdrom_start_read_continuation);
 	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;
 	struct cdrom_info *info = drive->driver_data;
 
 
 	info->dma = 0;
 	info->dma = 0;
-	info->cmd = 0;
 	rq->flags &= ~REQ_FAILED;
 	rq->flags &= ~REQ_FAILED;
 	len = rq->data_len;
 	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
 	/* use dma, if possible. we don't need to check more, since we
 	 * know that the transfer is always (at least!) frame aligned */
 	 * know that the transfer is always (at least!) frame aligned */
 	info->dma = drive->using_dma ? 1 : 0;
 	info->dma = drive->using_dma ? 1 : 0;
-	info->cmd = WRITE;
 
 
 	info->devinfo.media_written = 1;
 	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;
 	rq->flags |= REQ_QUIET;
 
 
 	info->dma = 0;
 	info->dma = 0;
-	info->cmd = 0;
 
 
 	/*
 	/*
 	 * sg request
 	 * 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;
 		int mask = drive->queue->dma_alignment;
 		unsigned long addr = (unsigned long) page_address(bio_page(rq->bio));
 		unsigned long addr = (unsigned long) page_address(bio_page(rq->bio));
 
 
-		info->cmd = rq_data_dir(rq);
 		info->dma = drive->using_dma;
 		info->dma = drive->using_dma;
 
 
 		/*
 		/*

+ 0 - 1
drivers/ide/ide-cd.h

@@ -480,7 +480,6 @@ struct cdrom_info {
 
 
 	struct request request_sense_request;
 	struct request request_sense_request;
 	int dma;
 	int dma;
-	int cmd;
 	unsigned long last_block;
 	unsigned long last_block;
 	unsigned long start_seek;
 	unsigned long start_seek;
 	/* Buffer to hold mechanism status and changer slot table. */
 	/* Buffer to hold mechanism status and changer slot table. */