diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2007-07-09 17:17:54 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-09 17:17:54 -0400 |
commit | 841d2a9bf16471716ba3a5172d24aa40a2ea9398 (patch) | |
tree | f836d41ed70bf3efd6350c293c0c31a40ef4f900 /drivers/ide/pci/hpt366.c | |
parent | b740d8846e2e184909e9f74d4ad9d67ae0e084ea (diff) |
ide: make void and rename ide_dma_lostirq() method
Since ide_dma_lostirq() method's result is discarded, make it return 'void'.
While at it, rename the method to dma_lost_irq(), drop the '__' prefix from the
default method's name, and do some cleanups in this method driver-wise:
- in aec62xx.c, rename the method in accordance with other drivers, and get rid
of unnecessary variables there;
- in pdc202xx_old.c, define/use 'hwif' variable;
- in sgiioc4.c, rearrange the code to call the resetproc() method directly.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/hpt366.c')
-rw-r--r-- | drivers/ide/pci/hpt366.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index c33d0b0f11c9..34d06dc7f2b2 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
@@ -737,7 +737,7 @@ static int hpt366_config_drive_xfer_rate(ide_drive_t *drive) | |||
737 | * This is specific to the HPT366 UDMA chipset | 737 | * This is specific to the HPT366 UDMA chipset |
738 | * by HighPoint|Triones Technologies, Inc. | 738 | * by HighPoint|Triones Technologies, Inc. |
739 | */ | 739 | */ |
740 | static int hpt366_ide_dma_lostirq(ide_drive_t *drive) | 740 | static void hpt366_dma_lost_irq(ide_drive_t *drive) |
741 | { | 741 | { |
742 | struct pci_dev *dev = HWIF(drive)->pci_dev; | 742 | struct pci_dev *dev = HWIF(drive)->pci_dev; |
743 | u8 mcr1 = 0, mcr3 = 0, scr1 = 0; | 743 | u8 mcr1 = 0, mcr3 = 0, scr1 = 0; |
@@ -749,7 +749,7 @@ static int hpt366_ide_dma_lostirq(ide_drive_t *drive) | |||
749 | drive->name, __FUNCTION__, mcr1, mcr3, scr1); | 749 | drive->name, __FUNCTION__, mcr1, mcr3, scr1); |
750 | if (scr1 & 0x10) | 750 | if (scr1 & 0x10) |
751 | pci_write_config_byte(dev, 0x5a, scr1 & ~0x10); | 751 | pci_write_config_byte(dev, 0x5a, scr1 & ~0x10); |
752 | return __ide_dma_lostirq(drive); | 752 | ide_dma_lost_irq(drive); |
753 | } | 753 | } |
754 | 754 | ||
755 | static void hpt370_clear_engine(ide_drive_t *drive) | 755 | static void hpt370_clear_engine(ide_drive_t *drive) |
@@ -1355,7 +1355,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) | |||
1355 | hwif->ide_dma_end = &hpt370_ide_dma_end; | 1355 | hwif->ide_dma_end = &hpt370_ide_dma_end; |
1356 | hwif->ide_dma_timeout = &hpt370_ide_dma_timeout; | 1356 | hwif->ide_dma_timeout = &hpt370_ide_dma_timeout; |
1357 | } else | 1357 | } else |
1358 | hwif->ide_dma_lostirq = &hpt366_ide_dma_lostirq; | 1358 | hwif->dma_lost_irq = &hpt366_dma_lost_irq; |
1359 | 1359 | ||
1360 | if (!noautodma) | 1360 | if (!noautodma) |
1361 | hwif->autodma = 1; | 1361 | hwif->autodma = 1; |