diff options
Diffstat (limited to 'drivers/ata/pata_via.c')
-rw-r--r-- | drivers/ata/pata_via.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index f0b6c3b71429..2addce11000a 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c | |||
@@ -391,11 +391,11 @@ static struct ata_port_operations via_port_ops_noirq = { | |||
391 | static void via_config_fifo(struct pci_dev *pdev, unsigned int flags) | 391 | static void via_config_fifo(struct pci_dev *pdev, unsigned int flags) |
392 | { | 392 | { |
393 | u8 enable; | 393 | u8 enable; |
394 | 394 | ||
395 | /* 0x40 low bits indicate enabled channels */ | 395 | /* 0x40 low bits indicate enabled channels */ |
396 | pci_read_config_byte(pdev, 0x40 , &enable); | 396 | pci_read_config_byte(pdev, 0x40 , &enable); |
397 | enable &= 3; | 397 | enable &= 3; |
398 | 398 | ||
399 | if (flags & VIA_SET_FIFO) { | 399 | if (flags & VIA_SET_FIFO) { |
400 | static const u8 fifo_setting[4] = {0x00, 0x60, 0x00, 0x20}; | 400 | static const u8 fifo_setting[4] = {0x00, 0x60, 0x00, 0x20}; |
401 | u8 fifo; | 401 | u8 fifo; |
@@ -516,7 +516,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
516 | 516 | ||
517 | /* Initialise the FIFO for the enabled channels. */ | 517 | /* Initialise the FIFO for the enabled channels. */ |
518 | via_config_fifo(pdev, config->flags); | 518 | via_config_fifo(pdev, config->flags); |
519 | 519 | ||
520 | /* Clock set up */ | 520 | /* Clock set up */ |
521 | switch(config->flags & VIA_UDMA) { | 521 | switch(config->flags & VIA_UDMA) { |
522 | case VIA_UDMA_NONE: | 522 | case VIA_UDMA_NONE: |
@@ -575,7 +575,7 @@ static int via_reinit_one(struct pci_dev *pdev) | |||
575 | u32 timing; | 575 | u32 timing; |
576 | struct ata_host *host = dev_get_drvdata(&pdev->dev); | 576 | struct ata_host *host = dev_get_drvdata(&pdev->dev); |
577 | const struct via_isa_bridge *config = host->private_data; | 577 | const struct via_isa_bridge *config = host->private_data; |
578 | 578 | ||
579 | via_config_fifo(pdev, config->flags); | 579 | via_config_fifo(pdev, config->flags); |
580 | 580 | ||
581 | if ((config->flags & VIA_UDMA) == VIA_UDMA_66) { | 581 | if ((config->flags & VIA_UDMA) == VIA_UDMA_66) { |
@@ -590,7 +590,7 @@ static int via_reinit_one(struct pci_dev *pdev) | |||
590 | timing &= ~0x80008; | 590 | timing &= ~0x80008; |
591 | pci_write_config_dword(pdev, 0x50, timing); | 591 | pci_write_config_dword(pdev, 0x50, timing); |
592 | } | 592 | } |
593 | return ata_pci_device_resume(pdev); | 593 | return ata_pci_device_resume(pdev); |
594 | } | 594 | } |
595 | 595 | ||
596 | static const struct pci_device_id via[] = { | 596 | static const struct pci_device_id via[] = { |