From 1a8c7fabda5bab4f12b0257616e466adad72e7bf Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 22 Oct 2004 23:10:29 +0200 Subject: [ide] kill ide_hwif_t->ide_dma_verbose * make __ide_dma_verbose() void and drop "__" prefix * ide_dma_verbose() is always available now * use it instead of ide_hwif_t->ide_dma_verbose * sgiioc4.c version reported wrong mode * icside.c version repeated info given by ->ide_dma_check() Signed-off-by: Bartlomiej Zolnierkiewicz --- include/linux/ide.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/linux') diff --git a/include/linux/ide.h b/include/linux/ide.h index b1e10fea86fc..284e9ab25aa1 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -874,7 +874,6 @@ typedef struct hwif_s { int (*ide_dma_test_irq)(ide_drive_t *drive); int (*ide_dma_host_on)(ide_drive_t *drive); int (*ide_dma_host_off)(ide_drive_t *drive); - int (*ide_dma_verbose)(ide_drive_t *drive); int (*ide_dma_lostirq)(ide_drive_t *drive); int (*ide_dma_timeout)(ide_drive_t *drive); @@ -1493,6 +1492,7 @@ void ide_init_sg_cmd(ide_drive_t *, struct request *); int __ide_dma_bad_drive(ide_drive_t *); int __ide_dma_good_drive(ide_drive_t *); int __ide_dma_off(ide_drive_t *); +void ide_dma_verbose(ide_drive_t *); #ifdef CONFIG_BLK_DEV_IDEDMA_PCI extern int ide_build_sglist(ide_drive_t *, struct request *); @@ -1511,13 +1511,13 @@ extern int ide_dma_setup(ide_drive_t *); extern void ide_dma_start(ide_drive_t *); extern int __ide_dma_end(ide_drive_t *); extern int __ide_dma_test_irq(ide_drive_t *); -extern int __ide_dma_verbose(ide_drive_t *); extern int __ide_dma_lostirq(ide_drive_t *); extern int __ide_dma_timeout(ide_drive_t *); #endif /* CONFIG_BLK_DEV_IDEDMA_PCI */ #else static inline int __ide_dma_off(ide_drive_t *drive) { return 0; } +static inline void ide_dma_verbose(ide_drive_t *drive) { ; } #endif /* CONFIG_BLK_DEV_IDEDMA */ #ifndef CONFIG_BLK_DEV_IDEDMA_PCI -- cgit v1.2.3