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

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

ide: make void and rename ide_dma_lostirq() method 



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

- in aec62xx.c, rename the method in accordance with other drivers, and get rid
  of unnecessary variables there;

- in pdc202xx_old.c, define/use 'hwif' variable;

- in sgiioc4.c, rearrange the code to call the resetproc() method directly.

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

drivers/ide/arm/icside.c

+2 −3
Original line number Diff line number Diff line
@@ -461,10 +461,9 @@ static int icside_dma_timeout(ide_drive_t *drive) 
	return icside_dma_end(drive);

}



static int icside_dma_lostirq(ide_drive_t *drive)

static void icside_dma_lost_irq(ide_drive_t *drive)

{

	printk(KERN_ERR "%s: IRQ lost\n", drive->name);

	return 1;

}



static void icside_dma_init(ide_hwif_t *hwif)
@@ -491,7 +490,7 @@ static void icside_dma_init(ide_hwif_t *hwif) 
	hwif->ide_dma_end	= icside_dma_end;

	hwif->ide_dma_test_irq	= icside_dma_test_irq;

	hwif->ide_dma_timeout	= icside_dma_timeout;

	hwif->ide_dma_lostirq	= icside_dma_lostirq;

	hwif->dma_lost_irq	= icside_dma_lost_irq;



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

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

drivers/ide/ide-dma.c

+4 −5
Original line number Diff line number Diff line
@@ -850,13 +850,12 @@ int ide_set_dma(ide_drive_t *drive) 
EXPORT_SYMBOL_GPL(ide_set_dma);



#ifdef CONFIG_BLK_DEV_IDEDMA_PCI

int __ide_dma_lostirq (ide_drive_t *drive)

void ide_dma_lost_irq (ide_drive_t *drive)

{

	printk("%s: DMA interrupt recovery\n", drive->name);

	return 1;

}



EXPORT_SYMBOL(__ide_dma_lostirq);

EXPORT_SYMBOL(ide_dma_lost_irq);



int __ide_dma_timeout (ide_drive_t *drive)

{
@@ -1020,8 +1019,8 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p 
		hwif->ide_dma_test_irq = &__ide_dma_test_irq;

	if (!hwif->ide_dma_timeout)

		hwif->ide_dma_timeout = &__ide_dma_timeout;

	if (!hwif->ide_dma_lostirq)

		hwif->ide_dma_lostirq = &__ide_dma_lostirq;

	if (!hwif->dma_lost_irq)

		hwif->dma_lost_irq = &ide_dma_lost_irq;



	if (hwif->chipset != ide_trm290) {

		u8 dma_stat = hwif->INB(hwif->dma_status);

drivers/ide/ide-io.c

+1 −1
Original line number Diff line number Diff line
@@ -1466,7 +1466,7 @@ void ide_timer_expiry (unsigned long data) 
				startstop = handler(drive);

			} else if (drive_is_ready(drive)) {

				if (drive->waiting_for_dma)

					(void) hwgroup->hwif->ide_dma_lostirq(drive);

					hwgroup->hwif->dma_lost_irq(drive);

				(void)ide_ack_intr(hwif);

				printk(KERN_WARNING "%s: lost interrupt\n", drive->name);

				startstop = handler(drive);

drivers/ide/ide.c

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

	hwif->dma_host_on		= tmp_hwif->dma_host_on;

	hwif->dma_host_off		= tmp_hwif->dma_host_off;

	hwif->ide_dma_lostirq		= tmp_hwif->ide_dma_lostirq;

	hwif->dma_lost_irq		= tmp_hwif->dma_lost_irq;

	hwif->ide_dma_timeout		= tmp_hwif->ide_dma_timeout;



	hwif->OUTB			= tmp_hwif->OUTB;

drivers/ide/mips/au1xxx-ide.c

+2 −3
Original line number Diff line number Diff line
@@ -456,10 +456,9 @@ static void auide_dma_off_quietly(ide_drive_t *drive) 
	drive->using_dma = 0;

}



static int auide_dma_lostirq(ide_drive_t *drive)

static void auide_dma_lost_irq(ide_drive_t *drive)

{

	printk(KERN_ERR "%s: IRQ lost\n", drive->name);

	return 0;

}



static void auide_ddma_tx_callback(int irq, void *param)
@@ -731,7 +730,7 @@ static int au_ide_probe(struct device *dev) 
	hwif->ide_dma_test_irq          = &auide_dma_test_irq;

	hwif->dma_host_off		= &auide_dma_host_off;

	hwif->dma_host_on		= &auide_dma_host_on;

	hwif->ide_dma_lostirq           = &auide_dma_lostirq;

	hwif->dma_lost_irq		= &auide_dma_lost_irq;

	hwif->ide_dma_on                = &auide_dma_on;



	hwif->autodma                   = 1;