Commit cc57ccc0 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ali14xx: 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 f06ab340

drivers/ide/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -981,6 +981,7 @@ config BLK_DEV_4DRIVES 


config BLK_DEV_ALI14XX

	tristate "ALI M14xx support"

	select IDE_TIMINGS

	help

	  This driver is enabled at runtime using the "ali14xx.probe" kernel

	  boot parameter.  It enables support for the secondary IDE interface

drivers/ide/legacy/ali14xx.c

+2 −1
Original line number Diff line number Diff line
@@ -117,10 +117,11 @@ static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	u8 param1, param2, param3, param4;

	unsigned long flags;

	int bus_speed = ide_vlb_clk ? ide_vlb_clk : 50;

	struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio);



	/* calculate timing, according to PIO mode */

	time1 = ide_pio_cycle_time(drive, pio);

	time2 = ide_pio_timings[pio].active_time;

	time2 = t->active;

	param3 = param1 = (time2 * bus_speed + 999) / 1000;

	param4 = param2 = (time1 * bus_speed + 999) / 1000 - param1;

	if (pio < 3) {