diff options
Diffstat (limited to 'drivers/ide/ide-cd.c')
| -rw-r--r-- | drivers/ide/ide-cd.c | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 57a5f63d6ae3..92ac658dac33 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -1650,31 +1650,6 @@ static int cdrom_write_check_ireason(ide_drive_t *drive, int len, int ireason) | |||
| 1650 | return 1; | 1650 | return 1; |
| 1651 | } | 1651 | } |
| 1652 | 1652 | ||
| 1653 | static void post_transform_command(struct request *req) | ||
| 1654 | { | ||
| 1655 | u8 *c = req->cmd; | ||
| 1656 | char *ibuf; | ||
| 1657 | |||
| 1658 | if (!blk_pc_request(req)) | ||
| 1659 | return; | ||
| 1660 | |||
| 1661 | if (req->bio) | ||
| 1662 | ibuf = bio_data(req->bio); | ||
| 1663 | else | ||
| 1664 | ibuf = req->data; | ||
| 1665 | |||
| 1666 | if (!ibuf) | ||
| 1667 | return; | ||
| 1668 | |||
| 1669 | /* | ||
| 1670 | * set ansi-revision and response data as atapi | ||
| 1671 | */ | ||
| 1672 | if (c[0] == GPCMD_INQUIRY) { | ||
| 1673 | ibuf[2] |= 2; | ||
| 1674 | ibuf[3] = (ibuf[3] & 0xf0) | 2; | ||
| 1675 | } | ||
| 1676 | } | ||
| 1677 | |||
| 1678 | typedef void (xfer_func_t)(ide_drive_t *, void *, u32); | 1653 | typedef void (xfer_func_t)(ide_drive_t *, void *, u32); |
| 1679 | 1654 | ||
| 1680 | /* | 1655 | /* |
| @@ -1810,9 +1785,6 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) | |||
| 1810 | return ide_started; | 1785 | return ide_started; |
| 1811 | 1786 | ||
| 1812 | end_request: | 1787 | end_request: |
| 1813 | if (!rq->data_len) | ||
| 1814 | post_transform_command(rq); | ||
| 1815 | |||
| 1816 | spin_lock_irqsave(&ide_lock, flags); | 1788 | spin_lock_irqsave(&ide_lock, flags); |
| 1817 | blkdev_dequeue_request(rq); | 1789 | blkdev_dequeue_request(rq); |
| 1818 | end_that_request_last(rq, 1); | 1790 | end_that_request_last(rq, 1); |
| @@ -3049,12 +3021,7 @@ int ide_cdrom_probe_capabilities (ide_drive_t *drive) | |||
| 3049 | else | 3021 | else |
| 3050 | printk(" drive"); | 3022 | printk(" drive"); |
| 3051 | 3023 | ||
| 3052 | printk(", %dkB Cache", be16_to_cpu(cap.buffer_size)); | 3024 | printk(KERN_CONT ", %dkB Cache\n", be16_to_cpu(cap.buffer_size)); |
| 3053 | |||
| 3054 | if (drive->using_dma) | ||
| 3055 | ide_dma_verbose(drive); | ||
| 3056 | |||
| 3057 | printk("\n"); | ||
| 3058 | 3025 | ||
| 3059 | return nslots; | 3026 | return nslots; |
| 3060 | } | 3027 | } |
