hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-10-13 21:39:46 +02:00
parent 653bcf5292
commit de23ec9ca8
4 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/ide/arm/icside.c
View File

@ -386,11 +386,6 @@ static void icside_dma_timeout(ide_drive_t *drive)
icside_dma_end(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) static int icside_dma_init(ide_hwif_t *hwif, const struct ide_port_info *d)
{ {
hwif->dmatable_cpu = NULL; hwif->dmatable_cpu = NULL;
@ -407,7 +402,7 @@ static const struct ide_dma_ops icside_v6_dma_ops = {
.dma_end = icside_dma_end, .dma_end = icside_dma_end,
.dma_test_irq = icside_dma_test_irq, .dma_test_irq = icside_dma_test_irq,
.dma_timeout = icside_dma_timeout, .dma_timeout = icside_dma_timeout,
.dma_lost_irq = icside_dma_lost_irq, .dma_lost_irq = ide_dma_lost_irq,
}; };
#else #else
#define icside_v6_dma_ops NULL #define icside_v6_dma_ops NULL

9
drivers/ide/ide-dma.c
View File

@ -823,14 +823,13 @@ void ide_check_dma_crc(ide_drive_t *drive)
ide_dma_on(drive); ide_dma_on(drive);
} }
#ifdef CONFIG_BLK_DEV_IDEDMA_SFF void ide_dma_lost_irq(ide_drive_t *drive)
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) void ide_dma_timeout (ide_drive_t *drive)
{ {
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);

7
drivers/ide/mips/au1xxx-ide.c
View File

@ -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) static void auide_ddma_tx_callback(int irq, void *param)
{ {
_auide_hwif *ahwif = (_auide_hwif*)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_start = auide_dma_start,
.dma_end = auide_dma_end, .dma_end = auide_dma_end,
.dma_test_irq = auide_dma_test_irq, .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, .dma_timeout = auide_dma_timeout,
}; };

3
include/linux/ide.h
View File

@ -1437,11 +1437,12 @@ void ide_dma_exec_cmd(ide_drive_t *, u8);
extern void ide_dma_start(ide_drive_t *); extern void ide_dma_start(ide_drive_t *);
int ide_dma_end(ide_drive_t *); int ide_dma_end(ide_drive_t *);
int ide_dma_test_irq(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 void ide_dma_timeout(ide_drive_t *);
extern const struct ide_dma_ops sff_dma_ops; extern const struct ide_dma_ops sff_dma_ops;
#endif /* CONFIG_BLK_DEV_IDEDMA_SFF */ #endif /* CONFIG_BLK_DEV_IDEDMA_SFF */
void ide_dma_lost_irq(ide_drive_t *);
#else #else
static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; } 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; } static inline u8 ide_find_dma_mode(ide_drive_t *drive, u8 speed) { return 0; }