lkml.org 
[lkml]   [2008]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/7] hd: WIN_* -> ATA_CMD_*
    Date
    * Use ATA_CMD_* defines instead of WIN_* ones.

    * Include <linux/ata.h> directly instead of through <linux/hdreg.h>.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/block/hd.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    Index: b/drivers/block/hd.c
    ===================================================================
    --- a/drivers/block/hd.c
    +++ b/drivers/block/hd.c
    @@ -39,6 +39,7 @@
    #include <linux/ioport.h>
    #include <linux/init.h>
    #include <linux/blkpg.h>
    +#include <linux/ata.h>
    #include <linux/hdreg.h>

    #define REALLY_SLOW_IO
    @@ -370,7 +371,7 @@ repeat:
    struct hd_i_struct *disk = &hd_info[i];
    disk->special_op = disk->recalibrate = 1;
    hd_out(disk, disk->sect, disk->sect, disk->head-1,
    - disk->cyl, WIN_SPECIFY, &reset_hd);
    + disk->cyl, ATA_CMD_INIT_DEV_PARAMS, &reset_hd);
    if (reset)
    goto repeat;
    } else
    @@ -558,7 +559,7 @@ static int do_special_op(struct hd_i_str
    {
    if (disk->recalibrate) {
    disk->recalibrate = 0;
    - hd_out(disk, disk->sect, 0, 0, 0, WIN_RESTORE, &recal_intr);
    + hd_out(disk, disk->sect, 0, 0, 0, ATA_CMD_RESTORE, &recal_intr);
    return reset;
    }
    if (disk->head > 16) {
    @@ -631,13 +632,13 @@ repeat:
    if (blk_fs_request(req)) {
    switch (rq_data_dir(req)) {
    case READ:
    - hd_out(disk, nsect, sec, head, cyl, WIN_READ,
    + hd_out(disk, nsect, sec, head, cyl, ATA_CMD_PIO_READ,
    &read_intr);
    if (reset)
    goto repeat;
    break;
    case WRITE:
    - hd_out(disk, nsect, sec, head, cyl, WIN_WRITE,
    + hd_out(disk, nsect, sec, head, cyl, ATA_CMD_PIO_WRITE,
    &write_intr);
    if (reset)
    goto repeat;

    \
     
     \ /
      Last update: 2008-07-23 20:53    [W:0.020 / U:30.900 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site