diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-cd.c | 7 | ||||
-rw-r--r-- | drivers/ide/ide-cd.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 9455e42abb23..b4d7a3efb90f 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -1292,7 +1292,6 @@ static ide_startstop_t cdrom_start_seek (ide_drive_t *drive, unsigned int block) | |||
1292 | struct cdrom_info *info = drive->driver_data; | 1292 | struct cdrom_info *info = drive->driver_data; |
1293 | 1293 | ||
1294 | info->dma = 0; | 1294 | info->dma = 0; |
1295 | info->cmd = 0; | ||
1296 | info->start_seek = jiffies; | 1295 | info->start_seek = jiffies; |
1297 | return cdrom_start_packet_command(drive, 0, cdrom_start_seek_continuation); | 1296 | return cdrom_start_packet_command(drive, 0, cdrom_start_seek_continuation); |
1298 | } | 1297 | } |
@@ -1344,8 +1343,6 @@ static ide_startstop_t cdrom_start_read (ide_drive_t *drive, unsigned int block) | |||
1344 | (rq->nr_sectors & (sectors_per_frame - 1))) | 1343 | (rq->nr_sectors & (sectors_per_frame - 1))) |
1345 | info->dma = 0; | 1344 | info->dma = 0; |
1346 | 1345 | ||
1347 | info->cmd = READ; | ||
1348 | |||
1349 | /* Start sending the read request to the drive. */ | 1346 | /* Start sending the read request to the drive. */ |
1350 | return cdrom_start_packet_command(drive, 32768, cdrom_start_read_continuation); | 1347 | return cdrom_start_packet_command(drive, 32768, cdrom_start_read_continuation); |
1351 | } | 1348 | } |
@@ -1484,7 +1481,6 @@ static ide_startstop_t cdrom_do_packet_command (ide_drive_t *drive) | |||
1484 | struct cdrom_info *info = drive->driver_data; | 1481 | struct cdrom_info *info = drive->driver_data; |
1485 | 1482 | ||
1486 | info->dma = 0; | 1483 | info->dma = 0; |
1487 | info->cmd = 0; | ||
1488 | rq->flags &= ~REQ_FAILED; | 1484 | rq->flags &= ~REQ_FAILED; |
1489 | len = rq->data_len; | 1485 | len = rq->data_len; |
1490 | 1486 | ||
@@ -1891,7 +1887,6 @@ static ide_startstop_t cdrom_start_write(ide_drive_t *drive, struct request *rq) | |||
1891 | /* use dma, if possible. we don't need to check more, since we | 1887 | /* use dma, if possible. we don't need to check more, since we |
1892 | * know that the transfer is always (at least!) frame aligned */ | 1888 | * know that the transfer is always (at least!) frame aligned */ |
1893 | info->dma = drive->using_dma ? 1 : 0; | 1889 | info->dma = drive->using_dma ? 1 : 0; |
1894 | info->cmd = WRITE; | ||
1895 | 1890 | ||
1896 | info->devinfo.media_written = 1; | 1891 | info->devinfo.media_written = 1; |
1897 | 1892 | ||
@@ -1916,7 +1911,6 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq) | |||
1916 | rq->flags |= REQ_QUIET; | 1911 | rq->flags |= REQ_QUIET; |
1917 | 1912 | ||
1918 | info->dma = 0; | 1913 | info->dma = 0; |
1919 | info->cmd = 0; | ||
1920 | 1914 | ||
1921 | /* | 1915 | /* |
1922 | * sg request | 1916 | * sg request |
@@ -1925,7 +1919,6 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq) | |||
1925 | int mask = drive->queue->dma_alignment; | 1919 | int mask = drive->queue->dma_alignment; |
1926 | unsigned long addr = (unsigned long) page_address(bio_page(rq->bio)); | 1920 | unsigned long addr = (unsigned long) page_address(bio_page(rq->bio)); |
1927 | 1921 | ||
1928 | info->cmd = rq_data_dir(rq); | ||
1929 | info->dma = drive->using_dma; | 1922 | info->dma = drive->using_dma; |
1930 | 1923 | ||
1931 | /* | 1924 | /* |
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h index 7ca3e5afc665..ad1f2ed14a37 100644 --- a/drivers/ide/ide-cd.h +++ b/drivers/ide/ide-cd.h | |||
@@ -480,7 +480,6 @@ struct cdrom_info { | |||
480 | 480 | ||
481 | struct request request_sense_request; | 481 | struct request request_sense_request; |
482 | int dma; | 482 | int dma; |
483 | int cmd; | ||
484 | unsigned long last_block; | 483 | unsigned long last_block; |
485 | unsigned long start_seek; | 484 | unsigned long start_seek; |
486 | /* Buffer to hold mechanism status and changer slot table. */ | 485 | /* Buffer to hold mechanism status and changer slot table. */ |