There should be no functionality change resulting from this patch.
Signed-off-by: Borislav Petkov <petkovbb@xxxxxxxxx>
---
drivers/ide/ide-atapi.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index c807515..4f0365f 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -202,7 +202,7 @@ int ide_set_media_lock(ide_drive_t *drive, struct gendisk *disk, int on)
{
struct ide_atapi_pc pc;
- if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) == 0)
+ if (!ide_drv_doorlocking(drive))
return 0;
ide_init_pc(&pc);
@@ -547,7 +547,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
return startstop;
}
- if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) {
+ if (ide_drv_drq_int(drive)) {
if (drive->dma)
drive->waiting_for_dma = 1;
}
@@ -570,7 +570,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
* miliseconds later in ide_delayed_transfer_pc() after the
* device says it's ready for a packet.
*/
- if (drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) {
+ if (ide_drv_zip(drive)) {
timeout = drive->pc_delay;
expiry = &ide_delayed_transfer_pc;
} else {
@@ -611,7 +611,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
}
/* Send the actual packet */
- if ((drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) == 0)
+ if (!ide_drv_zip(drive))
hwif->tp_ops->output_data(drive, NULL, rq->cmd, cmd_len);
return ide_started;
@@ -627,7 +627,6 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd)
unsigned int timeout;
u32 tf_flags;
u16 bcount;
- u8 drq_int = !!(drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT);
if (dev_is_idecd(drive)) {
tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;
@@ -659,7 +658,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd)
}
if ((pc->flags & PC_FLAG_DMA_OK) &&
- (drive->dev_flags & IDE_DFLAG_USING_DMA)) {
+ ide_drv_using_dma(drive)) {
if (ide_build_sglist(drive, cmd))
drive->dma = !dma_ops->dma_setup(drive, cmd);
else
@@ -677,7 +676,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd)
(void)do_rw_taskfile(drive, cmd);
- if (drq_int) {
+ if (ide_drv_drq_int(drive)) {
if (drive->dma)
drive->waiting_for_dma = 0;
hwif->expiry = expiry;
@@ -685,6 +684,6 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd)
ide_execute_command(drive, cmd, ide_transfer_pc, timeout);
- return drq_int ? ide_started : ide_transfer_pc(drive);
+ return ide_drv_drq_int(drive) ? ide_started : ide_transfer_pc(drive);
}
EXPORT_SYMBOL_GPL(ide_issue_pc);
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
