Commit 17b500de authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

cmd640: convert to use ide_timing_find_mode() 



There should be no functional changes caused by this patch.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 288911af

drivers/ide/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ config BLK_DEV_PLATFORM 
config BLK_DEV_CMD640

	tristate "CMD640 chipset bugfix/support"

	depends on X86

	select IDE_TIMINGS

	---help---

	  The CMD-Technologies CMD640 IDE chip is used on many common 486 and

	  Pentium motherboards, usually in combination with a "Neptune" or

drivers/ide/pci/cmd640.c

+6 −2
Original line number Diff line number Diff line
@@ -521,6 +521,7 @@ static void program_drive_counts(ide_drive_t *drive, unsigned int index) 
static void cmd640_set_mode(ide_drive_t *drive, unsigned int index,

			    u8 pio_mode, unsigned int cycle_time)

{

	struct ide_timing *t;

	int setup_time, active_time, recovery_time, clock_time;

	u8 setup_count, active_count, recovery_count, recovery_count2, cycle_count;

	int bus_speed;
@@ -532,8 +533,11 @@ static void cmd640_set_mode(ide_drive_t *drive, unsigned int index, 


	if (pio_mode > 5)

		pio_mode = 5;

	setup_time  = ide_pio_timings[pio_mode].setup_time;

	active_time = ide_pio_timings[pio_mode].active_time;



	t = ide_timing_find_mode(XFER_PIO_0 + pio_mode);

	setup_time  = t->setup;

	active_time = t->active;



	recovery_time = cycle_time - (setup_time + active_time);

	clock_time = 1000 / bus_speed;

	cycle_count = DIV_ROUND_UP(cycle_time, clock_time);