diff options
Diffstat (limited to 'drivers/ide/pci/hpt34x.c')
-rw-r--r-- | drivers/ide/pci/hpt34x.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index a1bb10188fe5..218852aaf22a 100644 --- a/drivers/ide/pci/hpt34x.c +++ b/drivers/ide/pci/hpt34x.c | |||
@@ -43,7 +43,7 @@ | |||
43 | 43 | ||
44 | #define HPT343_DEBUG_DRIVE_INFO 0 | 44 | #define HPT343_DEBUG_DRIVE_INFO 0 |
45 | 45 | ||
46 | static int hpt34x_tune_chipset(ide_drive_t *drive, const u8 speed) | 46 | static void hpt34x_set_mode(ide_drive_t *drive, const u8 speed) |
47 | { | 47 | { |
48 | struct pci_dev *dev = HWIF(drive)->pci_dev; | 48 | struct pci_dev *dev = HWIF(drive)->pci_dev; |
49 | u32 reg1= 0, tmp1 = 0, reg2 = 0, tmp2 = 0; | 49 | u32 reg1= 0, tmp1 = 0, reg2 = 0, tmp2 = 0; |
@@ -73,13 +73,11 @@ static int hpt34x_tune_chipset(ide_drive_t *drive, const u8 speed) | |||
73 | drive->dn, reg1, tmp1, reg2, tmp2, | 73 | drive->dn, reg1, tmp1, reg2, tmp2, |
74 | hi_speed, lo_speed); | 74 | hi_speed, lo_speed); |
75 | #endif /* HPT343_DEBUG_DRIVE_INFO */ | 75 | #endif /* HPT343_DEBUG_DRIVE_INFO */ |
76 | |||
77 | return(ide_config_drive_speed(drive, speed)); | ||
78 | } | 76 | } |
79 | 77 | ||
80 | static void hpt34x_set_pio_mode(ide_drive_t *drive, const u8 pio) | 78 | static void hpt34x_set_pio_mode(ide_drive_t *drive, const u8 pio) |
81 | { | 79 | { |
82 | (void) hpt34x_tune_chipset(drive, (XFER_PIO_0 + pio)); | 80 | hpt34x_set_mode(drive, XFER_PIO_0 + pio); |
83 | } | 81 | } |
84 | 82 | ||
85 | static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive) | 83 | static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive) |
@@ -145,7 +143,8 @@ static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif) | |||
145 | hwif->autodma = 0; | 143 | hwif->autodma = 0; |
146 | 144 | ||
147 | hwif->set_pio_mode = &hpt34x_set_pio_mode; | 145 | hwif->set_pio_mode = &hpt34x_set_pio_mode; |
148 | hwif->speedproc = &hpt34x_tune_chipset; | 146 | hwif->set_dma_mode = &hpt34x_set_mode; |
147 | |||
149 | hwif->drives[0].autotune = 1; | 148 | hwif->drives[0].autotune = 1; |
150 | hwif->drives[1].autotune = 1; | 149 | hwif->drives[1].autotune = 1; |
151 | 150 | ||