Skip to contentSkip to conversation

ide: fix au1xxx-ide breakage

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Apr 28, 2008 – Apr 29, 2008 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 1/1 ide: fix au1xxx-ide breakage

Quoted 24 lines · Sergei Shtylyov
Quoted 11 lines · Hello, I wrote:

Fix these warnings emitted when compiling drivers/ide/mips/au1xxx-ide.c:

include/asm/mach-au1x00/au1xxx_ide.h:137: warning: 'auide_tune_drive' declared `static' but never defined include/asm/mach-au1x00/au1xxx_ide.h:138: warning: 'auide_tune_chipset' declared
`static' but never defined

by wiping out the whole "function prototyping" section from the header file <asm-mips/mach-au1x00/au1xxx_ide.h> as it mostly declared functions that are already dead in the IDE driver; move the only useful prototype into the driver.

Quoted 7 lines
Signed-off-by Sergei Shtylyov <[email protected]>

---
I'm not sure thru which tree this should go -- probably thru Linux/MIPS one...

Bart, au1xxx-ide-fix-mwdma-support.patch will probably need to be updated to remove that added prototype since it won't be needed anymore...

Which you haven't done either in that patch or in
au1xxx-ide-use-init_dma-method.patch. So, face the consequences:

Quoted 8 lines

drivers/ide/mips/au1xxx-ide.c:456: error: conflicting types for 'auide_ddma_init' drivers/ide/mips/au1xxx-ide.c:51: error: previous declaration of 'auide_ddma_init' was here
drivers/ide/mips/au1xxx-ide.c:456: error: conflicting types for 'auide_ddma_init' drivers/ide/mips/au1xxx-ide.c:51: error: previous declaration of 'auide_ddma_init' was here
drivers/ide/mips/au1xxx-ide.c:51: warning: 'auide_ddma_init' used but never defined

Cc Sergei Shtylyov <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/mips/au1xxx-ide.c |    2 --
 1 file changed, 2 deletions(-)
drivers/ide/mips/au1xxx-ide.c +0 -2
Index: b/drivers/ide/mips/au1xxx-ide.c
===================================================================
@@ -48,8 +48,6 @@
 
 static _auide_hwif auide_hwif;
 
-static int auide_ddma_init(_auide_hwif *auide);
-
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA)
 
 void auide_insw(unsigned long port, void *addr, u32 count)