diff options
Diffstat (limited to 'drivers/ide/pci/hpt34x.c')
| -rw-r--r-- | drivers/ide/pci/hpt34x.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index 924eaa3a5708..2c24c3de8846 100644 --- a/drivers/ide/pci/hpt34x.c +++ b/drivers/ide/pci/hpt34x.c | |||
| @@ -43,15 +43,10 @@ | |||
| 43 | 43 | ||
| 44 | #define HPT343_DEBUG_DRIVE_INFO 0 | 44 | #define HPT343_DEBUG_DRIVE_INFO 0 |
| 45 | 45 | ||
| 46 | static u8 hpt34x_ratemask (ide_drive_t *drive) | ||
| 47 | { | ||
| 48 | return 1; | ||
| 49 | } | ||
| 50 | |||
| 51 | static int hpt34x_tune_chipset (ide_drive_t *drive, u8 xferspeed) | 46 | static int hpt34x_tune_chipset (ide_drive_t *drive, u8 xferspeed) |
| 52 | { | 47 | { |
| 53 | struct pci_dev *dev = HWIF(drive)->pci_dev; | 48 | struct pci_dev *dev = HWIF(drive)->pci_dev; |
| 54 | u8 speed = ide_rate_filter(hpt34x_ratemask(drive), xferspeed); | 49 | u8 speed = ide_rate_filter(drive, xferspeed); |
| 55 | u32 reg1= 0, tmp1 = 0, reg2 = 0, tmp2 = 0; | 50 | u32 reg1= 0, tmp1 = 0, reg2 = 0, tmp2 = 0; |
| 56 | u8 hi_speed, lo_speed; | 51 | u8 hi_speed, lo_speed; |
| 57 | 52 | ||
| @@ -89,29 +84,11 @@ static void hpt34x_tune_drive (ide_drive_t *drive, u8 pio) | |||
| 89 | (void) hpt34x_tune_chipset(drive, (XFER_PIO_0 + pio)); | 84 | (void) hpt34x_tune_chipset(drive, (XFER_PIO_0 + pio)); |
| 90 | } | 85 | } |
| 91 | 86 | ||
| 92 | /* | ||
| 93 | * This allows the configuration of ide_pci chipset registers | ||
| 94 | * for cards that learn about the drive's UDMA, DMA, PIO capabilities | ||
| 95 | * after the drive is reported by the OS. Initially for designed for | ||
| 96 | * HPT343 UDMA chipset by HighPoint|Triones Technologies, Inc. | ||
| 97 | */ | ||
| 98 | |||
| 99 | static int config_chipset_for_dma (ide_drive_t *drive) | ||
| 100 | { | ||
| 101 | u8 speed = ide_dma_speed(drive, hpt34x_ratemask(drive)); | ||
| 102 | |||
| 103 | if (!(speed)) | ||
| 104 | return 0; | ||
| 105 | |||
| 106 | (void) hpt34x_tune_chipset(drive, speed); | ||
| 107 | return ide_dma_enable(drive); | ||
| 108 | } | ||
| 109 | |||
| 110 | static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive) | 87 | static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive) |
| 111 | { | 88 | { |
| 112 | drive->init_speed = 0; | 89 | drive->init_speed = 0; |
| 113 | 90 | ||
| 114 | if (ide_use_dma(drive) && config_chipset_for_dma(drive)) | 91 | if (ide_tune_dma(drive)) |
| 115 | #ifndef CONFIG_HPT34X_AUTODMA | 92 | #ifndef CONFIG_HPT34X_AUTODMA |
| 116 | return -1; | 93 | return -1; |
| 117 | #else | 94 | #else |
