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

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

ide: make ide_dma_lost_irq() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n 



Make ide_dma_lost_irq() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n
and convert {ics,au1xxx-}ide.c to use it.

While at it:
- use EXPORT_SYMBOL_GPL() to match the rest of SFF DMA functions

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

drivers/ide/arm/icside.c

+1 −6
Original line number Diff line number Diff line
@@ -386,11 +386,6 @@ static void icside_dma_timeout(ide_drive_t *drive) 
	icside_dma_end(drive);

}



static void icside_dma_lost_irq(ide_drive_t *drive)

{

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

}



static int icside_dma_init(ide_hwif_t *hwif, const struct ide_port_info *d)

{

	hwif->dmatable_cpu	= NULL;
@@ -407,7 +402,7 @@ static const struct ide_dma_ops icside_v6_dma_ops = { 
	.dma_end		= icside_dma_end,

	.dma_test_irq		= icside_dma_test_irq,

	.dma_timeout		= icside_dma_timeout,

	.dma_lost_irq		= icside_dma_lost_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

};

#else

#define icside_v6_dma_ops NULL

drivers/ide/ide-dma.c

+4 −5
Original line number Diff line number Diff line
@@ -823,14 +823,13 @@ void ide_check_dma_crc(ide_drive_t *drive) 
		ide_dma_on(drive);

}



#ifdef CONFIG_BLK_DEV_IDEDMA_SFF

void ide_dma_lost_irq(ide_drive_t *drive)

{

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

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

}

EXPORT_SYMBOL_GPL(ide_dma_lost_irq);



EXPORT_SYMBOL(ide_dma_lost_irq);



#ifdef CONFIG_BLK_DEV_IDEDMA_SFF

void ide_dma_timeout (ide_drive_t *drive)

{

	ide_hwif_t *hwif = HWIF(drive);

drivers/ide/mips/au1xxx-ide.c

+1 −6
Original line number Diff line number Diff line
@@ -340,11 +340,6 @@ static void auide_dma_host_set(ide_drive_t *drive, int on) 
{

}



static void auide_dma_lost_irq(ide_drive_t *drive)

{

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

}



static void auide_ddma_tx_callback(int irq, void *param)

{

	_auide_hwif *ahwif = (_auide_hwif*)param;
@@ -390,7 +385,7 @@ static const struct ide_dma_ops au1xxx_dma_ops = { 
	.dma_start		= auide_dma_start,

	.dma_end		= auide_dma_end,

	.dma_test_irq		= auide_dma_test_irq,

	.dma_lost_irq		= auide_dma_lost_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timeout		= auide_dma_timeout,

};

include/linux/ide.h

+2 −1
Original line number Diff line number Diff line
@@ -1437,11 +1437,12 @@ void ide_dma_exec_cmd(ide_drive_t *, u8); 
extern void ide_dma_start(ide_drive_t *);

int ide_dma_end(ide_drive_t *);

int ide_dma_test_irq(ide_drive_t *);

extern void ide_dma_lost_irq(ide_drive_t *);

extern void ide_dma_timeout(ide_drive_t *);

extern const struct ide_dma_ops sff_dma_ops;

#endif /* CONFIG_BLK_DEV_IDEDMA_SFF */



void ide_dma_lost_irq(ide_drive_t *);



#else

static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; }

static inline u8 ide_find_dma_mode(ide_drive_t *drive, u8 speed) { return 0; }