ide-{floppy,tape}: PC_FLAG_DMA_RECOMMENDED -> PC_FLAG_DMA_OK

* Use PC_FLAG_DMA_OK flag instead of PC_FLAG_DMA_RECOMMENDED one.

* Remove no longer used PC_FLAG_DMA_RECOMMENDED flag.

There should be no functional changes caused by this patch.

Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index a9f3127a74ed32170ceeb478549ae5bb624509a1..dbefe35c1396660b49f19b172f297517cfdd169b 100644 (file)
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -630,7 +630,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive,
        }
        dma = 0;
 
-       if ((pc->flags & PC_FLAG_DMA_RECOMMENDED) && drive->using_dma)
+       if ((pc->flags & PC_FLAG_DMA_OK) && drive->using_dma)
                dma = !hwif->dma_ops->dma_setup(drive);
 
        ide_pktcmd_tf_load(drive, IDE_TFLAG_OUT_DEVICE, bcount, dma);
@@ -755,7 +755,7 @@ static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
                pc->flags |= PC_FLAG_WRITING;
        pc->buf = NULL;
        pc->req_xfer = pc->buf_size = blocks * floppy->block_size;
-       pc->flags |= PC_FLAG_DMA_RECOMMENDED;
+       pc->flags |= PC_FLAG_DMA_OK;
 }
 
 static void idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy,
@@ -769,7 +769,7 @@ static void idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy,
                pc->flags |= PC_FLAG_WRITING;
        pc->buf = rq->data;
        if (rq->bio)
-               pc->flags |= PC_FLAG_DMA_RECOMMENDED;
+               pc->flags |= PC_FLAG_DMA_OK;
        /*
         * possibly problematic, doesn't look like ide-floppy correctly
         * handled scattered requests if dma fails...

diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index ce9b6d327528a8cd5e57aa8ab1eb5b53318c35cd..e8a5852fa2d40979368038ddef3548531cd905a2 100644 (file)
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -1050,7 +1050,7 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive,
                pc->flags &= ~PC_FLAG_DMA_ERROR;
                ide_dma_off(drive);
        }
-       if ((pc->flags & PC_FLAG_DMA_RECOMMENDED) && drive->using_dma)
+       if ((pc->flags & PC_FLAG_DMA_OK) && drive->using_dma)
                dma_ok = !hwif->dma_ops->dma_setup(drive);
 
        ide_pktcmd_tf_load(drive, IDE_TFLAG_OUT_DEVICE, bcount, dma_ok);
@@ -1138,7 +1138,7 @@ static void idetape_create_read_cmd(idetape_tape_t *tape,
        pc->buf_size = length * tape->blk_size;
        pc->req_xfer = pc->buf_size;
        if (pc->req_xfer == tape->buffer_size)
-               pc->flags |= PC_FLAG_DMA_RECOMMENDED;
+               pc->flags |= PC_FLAG_DMA_OK;
 }
 
 static void idetape_create_write_cmd(idetape_tape_t *tape,
@@ -1157,7 +1157,7 @@ static void idetape_create_write_cmd(idetape_tape_t *tape,
        pc->buf_size = length * tape->blk_size;
        pc->req_xfer = pc->buf_size;
        if (pc->req_xfer == tape->buffer_size)
-               pc->flags |= PC_FLAG_DMA_RECOMMENDED;
+               pc->flags |= PC_FLAG_DMA_OK;
 }
 
 static ide_startstop_t idetape_do_request(ide_drive_t *drive,

diff --git a/include/linux/ide.h b/include/linux/ide.h
index f079456adfdb2a9b47e60a1bf6a994d736859b7e..63cee2947f60c18c31870080bf1f81572c01774f 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -602,12 +602,11 @@ enum {
        PC_FLAG_SUPPRESS_ERROR          = (1 << 1),
        PC_FLAG_WAIT_FOR_DSC            = (1 << 2),
        PC_FLAG_DMA_OK                  = (1 << 3),
-       PC_FLAG_DMA_RECOMMENDED         = (1 << 4),
-       PC_FLAG_DMA_IN_PROGRESS         = (1 << 5),
-       PC_FLAG_DMA_ERROR               = (1 << 6),
-       PC_FLAG_WRITING                 = (1 << 7),
+       PC_FLAG_DMA_IN_PROGRESS         = (1 << 4),
+       PC_FLAG_DMA_ERROR               = (1 << 5),
+       PC_FLAG_WRITING                 = (1 << 6),
        /* command timed out */
-       PC_FLAG_TIMEDOUT                = (1 << 8),
+       PC_FLAG_TIMEDOUT                = (1 << 7),
 };
 
 struct ide_atapi_pc {