Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 288911af authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

alim15x3: 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 2feecfac

drivers/ide/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -458,6 +458,7 @@ config BLK_DEV_AEC62XX 


config BLK_DEV_ALI15X3

	tristate "ALI M15x3 chipset support"

	select IDE_TIMINGS

	select BLK_DEV_IDEDMA_PCI

	help

	  This driver ensures (U)DMA support for ALI 1533, 1543 and 1543C

drivers/ide/pci/alim15x3.c

+2 −4
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio) 
{

	ide_hwif_t *hwif = HWIF(drive);

	struct pci_dev *dev = to_pci_dev(hwif->dev);

	int s_time, a_time, c_time;

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

	int s_time = t->setup, a_time = t->active, c_time = t->cycle;

	u8 s_clc, a_clc, r_clc;

	unsigned long flags;

	int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
@@ -78,13 +79,10 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	u8 cd_dma_fifo = 0;

	int unit = drive->select.b.unit & 1;



	s_time = ide_pio_timings[pio].setup_time;

	a_time = ide_pio_timings[pio].active_time;

	if ((s_clc = (s_time * bus_speed + 999) / 1000) >= 8)

		s_clc = 0;

	if ((a_clc = (a_time * bus_speed + 999) / 1000) >= 8)

		a_clc = 0;

	c_time = ide_pio_timings[pio].cycle_time;



	if (!(r_clc = (c_time * bus_speed + 999) / 1000 - a_clc - s_clc)) {

		r_clc = 1;