aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_legacy.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_legacy.c')
-rw-r--r--drivers/ata/pata_legacy.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index eb510660b424..ad37c220bb2c 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -211,11 +211,11 @@ static void pdc20230_set_piomode(struct ata_port *ap, struct ata_device *adev)
211 int pio = adev->pio_mode - XFER_PIO_0; 211 int pio = adev->pio_mode - XFER_PIO_0;
212 u8 rt; 212 u8 rt;
213 unsigned long flags; 213 unsigned long flags;
214 214
215 /* Safe as UP only. Force I/Os to occur together */ 215 /* Safe as UP only. Force I/Os to occur together */
216 216
217 local_irq_save(flags); 217 local_irq_save(flags);
218 218
219 /* Unlock the control interface */ 219 /* Unlock the control interface */
220 do 220 do
221 { 221 {
@@ -230,7 +230,7 @@ static void pdc20230_set_piomode(struct ata_port *ap, struct ata_device *adev)
230 while((inb(0x1F2) & 0x80) && --tries); 230 while((inb(0x1F2) & 0x80) && --tries);
231 231
232 local_irq_restore(flags); 232 local_irq_restore(flags);
233 233
234 outb(inb(0x1F4) & 0x07, 0x1F4); 234 outb(inb(0x1F4) & 0x07, 0x1F4);
235 235
236 rt = inb(0x1F3); 236 rt = inb(0x1F3);
@@ -425,7 +425,7 @@ static struct ata_port_operations ht6560b_port_ops = {
425/* 425/*
426 * Opti core chipset helpers 426 * Opti core chipset helpers
427 */ 427 */
428 428
429/** 429/**
430 * opti_syscfg - read OPTI chipset configuration 430 * opti_syscfg - read OPTI chipset configuration
431 * @reg: Configuration register to read 431 * @reg: Configuration register to read
@@ -437,7 +437,7 @@ static u8 opti_syscfg(u8 reg)
437{ 437{
438 unsigned long flags; 438 unsigned long flags;
439 u8 r; 439 u8 r;
440 440
441 /* Uniprocessor chipset and must force cycles adjancent */ 441 /* Uniprocessor chipset and must force cycles adjancent */
442 local_irq_save(flags); 442 local_irq_save(flags);
443 outb(reg, 0x22); 443 outb(reg, 0x22);
@@ -719,7 +719,7 @@ static __init int legacy_init_one(int port, unsigned long io, unsigned long ctrl
719 } 719 }
720 720
721 /* Probe for automatically detectable controllers */ 721 /* Probe for automatically detectable controllers */
722 722
723 if (io == 0x1F0 && ops == &legacy_port_ops) { 723 if (io == 0x1F0 && ops == &legacy_port_ops) {
724 unsigned long flags; 724 unsigned long flags;
725 725
@@ -868,7 +868,7 @@ static __init int legacy_init(void)
868 last_port = 2; 868 last_port = 2;
869 } 869 }
870 870
871 /* If an OPTI 82C46X is present find out where the channels are */ 871 /* If an OPTI 82C46X is present find out where the channels are */
872 if (opti82c46x) { 872 if (opti82c46x) {
873 static const char *optis[4] = { 873 static const char *optis[4] = {
874 "3/463MV", "5MV", 874 "3/463MV", "5MV",
@@ -876,7 +876,7 @@ static __init int legacy_init(void)
876 }; 876 };
877 u8 chans = 1; 877 u8 chans = 1;
878 u8 ctrl = (opti_syscfg(0x30) & 0xC0) >> 6; 878 u8 ctrl = (opti_syscfg(0x30) & 0xC0) >> 6;
879 879
880 opti82c46x = 3; /* Assume master and slave first */ 880 opti82c46x = 3; /* Assume master and slave first */
881 printk(KERN_INFO DRV_NAME ": Opti 82C46%s chipset support.\n", optis[ctrl]); 881 printk(KERN_INFO DRV_NAME ": Opti 82C46%s chipset support.\n", optis[ctrl]);
882 if (ctrl == 3) 882 if (ctrl == 3)