lkml.org 
[lkml]   [2008]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 9/12] ide-floppy: remove unused IDEFLOPPY_USE_READ12
    Date
    This flag is not being set anywhere in the driver so it can go.

    Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de>
    ---
    drivers/ide/ide-floppy.c | 17 ++++++-----------
    1 files changed, 6 insertions(+), 11 deletions(-)

    diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
    index 6c917fc..790e33f 100644
    --- a/drivers/ide/ide-floppy.c
    +++ b/drivers/ide/ide-floppy.c
    @@ -180,7 +180,6 @@ typedef struct ide_floppy_obj {
    */
    #define IDEFLOPPY_DRQ_INTERRUPT 0 /* DRQ interrupt device */
    #define IDEFLOPPY_MEDIA_CHANGED 1 /* Media may have changed */
    -#define IDEFLOPPY_USE_READ12 2 /* Use READ12/WRITE12 or READ10/WRITE10 */
    #define IDEFLOPPY_FORMAT_IN_PROGRESS 3 /* Format in progress */
    #define IDEFLOPPY_CLIK_DRIVE 4 /* Avoid commands not supported in Clik drive */
    #define IDEFLOPPY_ZIP_DRIVE 5 /* Requires BH algorithm for packets */
    @@ -889,25 +888,21 @@ static void idefloppy_create_test_unit_ready_cmd(idefloppy_pc_t *pc)
    pc->c[0] = GPCMD_TEST_UNIT_READY;
    }

    -static void idefloppy_create_rw_cmd (idefloppy_floppy_t *floppy, idefloppy_pc_t *pc, struct request *rq, unsigned long sector)
    +static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
    + idefloppy_pc_t *pc, struct request *rq, unsigned long sector)
    {
    int block = sector / floppy->bs_factor;
    int blocks = rq->nr_sectors / floppy->bs_factor;
    int cmd = rq_data_dir(rq);

    - debug_log("create_rw1%d_cmd: block == %d, blocks == %d\n",
    - 2 * test_bit (IDEFLOPPY_USE_READ12, &floppy->flags),
    + debug_log("create_rw10_cmd: block == %d, blocks == %d\n",
    block, blocks);

    idefloppy_init_pc(pc);
    - if (test_bit(IDEFLOPPY_USE_READ12, &floppy->flags)) {
    - pc->c[0] = cmd == READ ? GPCMD_READ_12 : GPCMD_WRITE_12;
    - put_unaligned(cpu_to_be32(blocks), (unsigned int *) &pc->c[6]);
    - } else {
    - pc->c[0] = cmd == READ ? GPCMD_READ_10 : GPCMD_WRITE_10;
    - put_unaligned(cpu_to_be16(blocks), (unsigned short *)&pc->c[7]);
    - }
    + pc->c[0] = cmd == READ ? GPCMD_READ_10 : GPCMD_WRITE_10;
    + put_unaligned(cpu_to_be16(blocks), (unsigned short *)&pc->c[7]);
    put_unaligned(cpu_to_be32(block), (unsigned int *) &pc->c[2]);
    +
    pc->callback = &idefloppy_rw_callback;
    pc->rq = rq;
    pc->b_count = cmd == READ ? 0 : rq->bio->bi_size;
    --
    1.5.3.7


    \
     
     \ /
      Last update: 2008-01-13 21:27    [W:0.023 / U:1.644 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site