aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/hd.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-10 16:39:21 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-10 16:39:21 -0400
commitf26b3d75959e9a0e43a2e1e1148c075592746c3d (patch)
tree319de87c4a4ecf2f600db57737d885c5a44ee2a3 /drivers/block/hd.c
parentaaaade3f059fa1b57283d4a7c8351a42ec747bf0 (diff)
hd: WIN_* -> ATA_CMD_*
* 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>
Diffstat (limited to 'drivers/block/hd.c')
-rw-r--r--drivers/block/hd.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index 682243bf2e4..482c0c4b964 100644
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -39,6 +39,7 @@
39#include <linux/ioport.h> 39#include <linux/ioport.h>
40#include <linux/init.h> 40#include <linux/init.h>
41#include <linux/blkpg.h> 41#include <linux/blkpg.h>
42#include <linux/ata.h>
42#include <linux/hdreg.h> 43#include <linux/hdreg.h>
43 44
44#define REALLY_SLOW_IO 45#define REALLY_SLOW_IO
@@ -370,7 +371,7 @@ repeat:
370 struct hd_i_struct *disk = &hd_info[i]; 371 struct hd_i_struct *disk = &hd_info[i];
371 disk->special_op = disk->recalibrate = 1; 372 disk->special_op = disk->recalibrate = 1;
372 hd_out(disk, disk->sect, disk->sect, disk->head-1, 373 hd_out(disk, disk->sect, disk->sect, disk->head-1,
373 disk->cyl, WIN_SPECIFY, &reset_hd); 374 disk->cyl, ATA_CMD_INIT_DEV_PARAMS, &reset_hd);
374 if (reset) 375 if (reset)
375 goto repeat; 376 goto repeat;
376 } else 377 } else
@@ -558,7 +559,7 @@ static int do_special_op(struct hd_i_struct *disk, struct request *req)
558{ 559{
559 if (disk->recalibrate) { 560 if (disk->recalibrate) {
560 disk->recalibrate = 0; 561 disk->recalibrate = 0;
561 hd_out(disk, disk->sect, 0, 0, 0, WIN_RESTORE, &recal_intr); 562 hd_out(disk, disk->sect, 0, 0, 0, ATA_CMD_RESTORE, &recal_intr);
562 return reset; 563 return reset;
563 } 564 }
564 if (disk->head > 16) { 565 if (disk->head > 16) {
@@ -631,13 +632,13 @@ repeat:
631 if (blk_fs_request(req)) { 632 if (blk_fs_request(req)) {
632 switch (rq_data_dir(req)) { 633 switch (rq_data_dir(req)) {
633 case READ: 634 case READ:
634 hd_out(disk, nsect, sec, head, cyl, WIN_READ, 635 hd_out(disk, nsect, sec, head, cyl, ATA_CMD_PIO_READ,
635 &read_intr); 636 &read_intr);
636 if (reset) 637 if (reset)
637 goto repeat; 638 goto repeat;
638 break; 639 break;
639 case WRITE: 640 case WRITE:
640 hd_out(disk, nsect, sec, head, cyl, WIN_WRITE, 641 hd_out(disk, nsect, sec, head, cyl, ATA_CMD_PIO_WRITE,
641 &write_intr); 642 &write_intr);
642 if (reset) 643 if (reset)
643 goto repeat; 644 goto repeat;