diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-19 18:32:36 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-19 18:32:36 -0400 |
commit | d393aa0326436efd3cb800916b08cdac4dd1091a (patch) | |
tree | 2fae9665c336a40d9a20a77612cac61daf107dce /drivers/ide/pci | |
parent | 69e88d2a754fcaf7ef8ca465586b811cf40dc479 (diff) |
ide: take ide_lock for prefetch disable/enable in do_special()
Take ide_lock for prefetch disable/enable in do_special(),
then cleanup cmd640 and ht6560b host drivers.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci')
-rw-r--r-- | drivers/ide/pci/cmd640.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c index 0e9275d7459c..4aa48104e0c1 100644 --- a/drivers/ide/pci/cmd640.c +++ b/drivers/ide/pci/cmd640.c | |||
@@ -632,7 +632,6 @@ static void cmd640_set_mode (unsigned int index, u8 pio_mode, unsigned int cycle | |||
632 | 632 | ||
633 | static void cmd640_set_pio_mode(ide_drive_t *drive, const u8 pio) | 633 | static void cmd640_set_pio_mode(ide_drive_t *drive, const u8 pio) |
634 | { | 634 | { |
635 | unsigned long flags; | ||
636 | unsigned int index = 0, cycle_time; | 635 | unsigned int index = 0, cycle_time; |
637 | u8 b; | 636 | u8 b; |
638 | 637 | ||
@@ -655,12 +654,7 @@ static void cmd640_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
655 | 654 | ||
656 | case 8: /* set prefetch off */ | 655 | case 8: /* set prefetch off */ |
657 | case 9: /* set prefetch on */ | 656 | case 9: /* set prefetch on */ |
658 | /* | ||
659 | * take ide_lock for drive->[no_]unmask/[no_]io_32bit | ||
660 | */ | ||
661 | spin_lock_irqsave(&ide_lock, flags); | ||
662 | set_prefetch_mode(index, pio & 1); | 657 | set_prefetch_mode(index, pio & 1); |
663 | spin_unlock_irqrestore(&ide_lock, flags); | ||
664 | printk("%s: %sabled cmd640 prefetch\n", drive->name, (pio & 1) ? "en" : "dis"); | 658 | printk("%s: %sabled cmd640 prefetch\n", drive->name, (pio & 1) ? "en" : "dis"); |
665 | return; | 659 | return; |
666 | } | 660 | } |