lkml.org 
[lkml]   [2009]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3/7] ide: merge ide_disk_special() into do_special()
    While at it:
    - change debug printk() level to KERN_DEBUG
    - update documentation

    There should be no functional changes caused by this patch.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/ide/ide-io.c | 44 ++++++++++++++++++--------------------------
    1 file changed, 18 insertions(+), 26 deletions(-)

    Index: b/drivers/ide/ide-io.c
    ===================================================================
    --- a/drivers/ide/ide-io.c
    +++ b/drivers/ide/ide-io.c
    @@ -184,11 +184,28 @@ static void ide_tf_set_setmult_cmd(ide_d
    tf->command = ATA_CMD_SET_MULTI;
    }

    -static ide_startstop_t ide_disk_special(ide_drive_t *drive)
    +/**
    + * do_special - issue some special commands
    + * @drive: drive the command is for
    + *
    + * do_special() is used to issue ATA_CMD_INIT_DEV_PARAMS,
    + * ATA_CMD_RESTORE and ATA_CMD_SET_MULTI commands to a drive.
    + */
    +
    +static ide_startstop_t do_special(ide_drive_t *drive)
    {
    special_t *s = &drive->special;
    struct ide_cmd cmd;

    +#ifdef DEBUG
    + printk(KERN_DEBUG "%s: %s: 0x%02x\n", drive->name, s->all);
    +#endif
    + if (drive->media != ide_disk) {
    + s->all = 0;
    + drive->mult_req = 0;
    + return ide_stopped;
    + }
    +
    memset(&cmd, 0, sizeof(cmd));
    cmd.protocol = ATA_PROT_NODATA;

    @@ -213,31 +230,6 @@ static ide_startstop_t ide_disk_special(
    return ide_started;
    }

    -/**
    - * do_special - issue some special commands
    - * @drive: drive the command is for
    - *
    - * do_special() is used to issue ATA_CMD_INIT_DEV_PARAMS,
    - * ATA_CMD_RESTORE and ATA_CMD_SET_MULTI commands to a drive.
    - *
    - * It used to do much more, but has been scaled back.
    - */
    -
    -static ide_startstop_t do_special (ide_drive_t *drive)
    -{
    - special_t *s = &drive->special;
    -
    -#ifdef DEBUG
    - printk("%s: do_special: 0x%02x\n", drive->name, s->all);
    -#endif
    - if (drive->media == ide_disk)
    - return ide_disk_special(drive);
    -
    - s->all = 0;
    - drive->mult_req = 0;
    - return ide_stopped;
    -}
    -
    void ide_map_sg(ide_drive_t *drive, struct ide_cmd *cmd)
    {
    ide_hwif_t *hwif = drive->hwif;

    \
     
     \ /
      Last update: 2009-05-13 22:53    [W:0.021 / U:1.400 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site