Commit c283f5db authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: make void and rename ide_dma_timeout() method 



Since ide_dma_timeout() method's result is discarded, make it return 'void'.
While at it, drop 'ide_' from the method's name, drop the '__' prefix from
the default method's name, and do some cleanups in this method driver-wise:

- in ide-dma.c, au1xxx-ide.c, and pdc202xx_old.c, define/use 'hwif' variable;

- in au1xxx-ide.c, get rid of commented out printk();

- in sl82c105.c, get rid of unnecessary variables.

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

drivers/ide/arm/icside.c

+5 −6
Original line number Diff line number Diff line
@@ -448,17 +448,16 @@ static int icside_dma_test_irq(ide_drive_t *drive) 
			ICS_ARCIN_V6_INTRSTAT_1)) & 1;

}



static int icside_dma_timeout(ide_drive_t *drive)

static void icside_dma_timeout(ide_drive_t *drive)

{

	printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name);



	if (icside_dma_test_irq(drive))

		return 0;

		return;



	ide_dump_status(drive, "DMA timeout",

		HWIF(drive)->INB(IDE_STATUS_REG));

	ide_dump_status(drive, "DMA timeout", HWIF(drive)->INB(IDE_STATUS_REG));



	return icside_dma_end(drive);

	icside_dma_end(drive);

}



static void icside_dma_lost_irq(ide_drive_t *drive)
@@ -489,7 +488,7 @@ static void icside_dma_init(ide_hwif_t *hwif) 
	hwif->dma_start		= icside_dma_start;

	hwif->ide_dma_end	= icside_dma_end;

	hwif->ide_dma_test_irq	= icside_dma_test_irq;

	hwif->ide_dma_timeout	= icside_dma_timeout;

	hwif->dma_timeout	= icside_dma_timeout;

	hwif->dma_lost_irq	= icside_dma_lost_irq;



	hwif->drives[0].autodma = hwif->autodma;

drivers/ide/ide-dma.c

+10 −7
Original line number Diff line number Diff line
@@ -857,16 +857,19 @@ void ide_dma_lost_irq (ide_drive_t *drive) 


EXPORT_SYMBOL(ide_dma_lost_irq);



int __ide_dma_timeout (ide_drive_t *drive)

void ide_dma_timeout (ide_drive_t *drive)

{

	ide_hwif_t *hwif = HWIF(drive);



	printk(KERN_ERR "%s: timeout waiting for DMA\n", drive->name);

	if (HWIF(drive)->ide_dma_test_irq(drive))

		return 0;



	return HWIF(drive)->ide_dma_end(drive);

	if (hwif->ide_dma_test_irq(drive))

		return;



	hwif->ide_dma_end(drive);

}



EXPORT_SYMBOL(__ide_dma_timeout);

EXPORT_SYMBOL(ide_dma_timeout);



/*

 * Needed for allowing full modular support of ide-driver
@@ -1017,8 +1020,8 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p 
		hwif->ide_dma_end = &__ide_dma_end;

	if (!hwif->ide_dma_test_irq)

		hwif->ide_dma_test_irq = &__ide_dma_test_irq;

	if (!hwif->ide_dma_timeout)

		hwif->ide_dma_timeout = &__ide_dma_timeout;

	if (!hwif->dma_timeout)

		hwif->dma_timeout = &ide_dma_timeout;

	if (!hwif->dma_lost_irq)

		hwif->dma_lost_irq = &ide_dma_lost_irq;

drivers/ide/ide-io.c

+1 −1
Original line number Diff line number Diff line
@@ -1350,7 +1350,7 @@ static ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) 
						hwif->INB(IDE_STATUS_REG));

	} else {

		printk(KERN_WARNING "%s: DMA timeout retry\n", drive->name);

		(void) hwif->ide_dma_timeout(drive);

		hwif->dma_timeout(drive);

	}



	/*

drivers/ide/ide.c

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif) 
	hwif->dma_host_on		= tmp_hwif->dma_host_on;

	hwif->dma_host_off		= tmp_hwif->dma_host_off;

	hwif->dma_lost_irq		= tmp_hwif->dma_lost_irq;

	hwif->ide_dma_timeout		= tmp_hwif->ide_dma_timeout;

	hwif->dma_timeout		= tmp_hwif->dma_timeout;



	hwif->OUTB			= tmp_hwif->OUTB;

	hwif->OUTBSYNC			= tmp_hwif->OUTBSYNC;

drivers/ide/mips/au1xxx-ide.c

+6 −6
Original line number Diff line number Diff line
@@ -488,16 +488,16 @@ static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 de 
  

#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)



static int auide_dma_timeout(ide_drive_t *drive)

static void auide_dma_timeout(ide_drive_t *drive)

{

//      printk("%s\n", __FUNCTION__);

	ide_hwif_t *hwif = HWIF(drive);



	printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name);



	if (HWIF(drive)->ide_dma_test_irq(drive))

		return 0;

	if (hwif->ide_dma_test_irq(drive))

		return;



	return HWIF(drive)->ide_dma_end(drive);

	hwif->ide_dma_end(drive);

}
@@ -720,7 +720,7 @@ static int au_ide_probe(struct device *dev) 


#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA

	hwif->dma_off_quietly		= &auide_dma_off_quietly;

	hwif->ide_dma_timeout           = &auide_dma_timeout;

	hwif->dma_timeout		= &auide_dma_timeout;



	hwif->ide_dma_check             = &auide_dma_check;

	hwif->dma_exec_cmd              = &auide_dma_exec_cmd;

CRA Git | Maintained and supported by SUSTech CRA and CCSE