Commit c46f87f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  pdc202xx_old: fix resetproc() method
  pdc202xx_old: fix 'pdc20246_dma_ops'
parents 6025974b 669165da

drivers/ide/pdc202xx_old.c

+6 −16
Original line number Diff line number Diff line 
/*

 *  Copyright (C) 1998-2002		Andre Hedrick <andre@linux-ide.org>

 *  Copyright (C) 2006-2007		MontaVista Software, Inc.

 *  Copyright (C) 2006-2007, 2009	MontaVista Software, Inc.

 *  Copyright (C) 2007			Bartlomiej Zolnierkiewicz

 *

 *  Portions Copyright (C) 1999 Promise Technology, Inc.
@@ -227,28 +227,19 @@ static int pdc202xx_dma_test_irq(ide_drive_t *drive) 
	return (dma_stat & 4) == 4;	/* return 1 if INTR asserted */

}



static void pdc202xx_reset_host (ide_hwif_t *hwif)

static void pdc202xx_reset(ide_drive_t *drive)

{

	ide_hwif_t *hwif	= drive->hwif;

	unsigned long high_16	= hwif->extra_base - 16;

	u8 udma_speed_flag	= inb(high_16 | 0x001f);



	printk(KERN_WARNING "PDC202xx: software reset...\n");



	outb(udma_speed_flag | 0x10, high_16 | 0x001f);

	mdelay(100);

	outb(udma_speed_flag & ~0x10, high_16 | 0x001f);

	mdelay(2000);	/* 2 seconds ?! */



	printk(KERN_WARNING "PDC202XX: %s channel reset.\n",

		hwif->channel ? "Secondary" : "Primary");

}



static void pdc202xx_reset (ide_drive_t *drive)

{

	ide_hwif_t *hwif	= drive->hwif;

	ide_hwif_t *mate	= hwif->mate;



	pdc202xx_reset_host(hwif);

	pdc202xx_reset_host(mate);



	ide_set_max_pio(drive);

}
@@ -328,9 +319,8 @@ static const struct ide_dma_ops pdc20246_dma_ops = { 
	.dma_start		= ide_dma_start,

	.dma_end		= ide_dma_end,

	.dma_test_irq		= pdc202xx_dma_test_irq,

	.dma_lost_irq		= pdc202xx_dma_lost_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timer_expiry	= ide_dma_sff_timer_expiry,

	.dma_clear		= pdc202xx_reset,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};