[PATCH] Au1200: kill IDE driver function prototypes

[PATCH] Au1200: kill IDE driver function prototypes

[Sergei Shtylyov]

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.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

---
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...

 drivers/ide/mips/au1xxx-ide.c             |    2 ++
 include/asm-mips/mach-au1x00/au1xxx_ide.h |   18 ------------------
 2 files changed, 2 insertions(+), 18 deletions(-)

Index: linux-2.6/drivers/ide/mips/au1xxx-ide.c
===================================================================
--- linux-2.6.orig/drivers/ide/mips/au1xxx-ide.c
+++ linux-2.6/drivers/ide/mips/au1xxx-ide.c
@@ -56,6 +56,8 @@
 static _auide_hwif auide_hwif;
 static int dbdma_init_done;
 
+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)
Index: linux-2.6/include/asm-mips/mach-au1x00/au1xxx_ide.h
===================================================================
--- linux-2.6.orig/include/asm-mips/mach-au1x00/au1xxx_ide.h
+++ linux-2.6/include/asm-mips/mach-au1x00/au1xxx_ide.h
@@ -122,24 +122,6 @@ static const struct drive_list_entry dma
 };
 #endif
 
-/* function prototyping */
-u8 auide_inb(unsigned long port);
-u16 auide_inw(unsigned long port);
-u32 auide_inl(unsigned long port);
-void auide_insw(unsigned long port, void *addr, u32 count);
-void auide_insl(unsigned long port, void *addr, u32 count);
-void auide_outb(u8 addr, unsigned long port);
-void auide_outbsync(ide_drive_t *drive, u8 addr, unsigned long port);
-void auide_outw(u16 addr, unsigned long port);
-void auide_outl(u32 addr, unsigned long port);
-void auide_outsw(unsigned long port, void *addr, u32 count);
-void auide_outsl(unsigned long port, void *addr, u32 count);
-static void auide_tune_drive(ide_drive_t *drive, byte pio);
-static int auide_tune_chipset(ide_drive_t *drive, u8 speed);
-static int auide_ddma_init( _auide_hwif *auide );
-static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif);
-int __init auide_probe(void);
-
 /*******************************************************************************
 * PIO Mode timing calculation :                                                *
 *                                                                              *

Re: [PATCH] Au1200: kill IDE driver function prototypes

[Bartlomiej Zolnierkiewicz]

On Monday 14 April 2008, Sergei Shtylyov 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.
> 
> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

applied

> ---
> 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...

I would prefer to merge this patch thru IDE tree because of the above and
the fact that it only touches "IDE" files - I hope Ralf is fine with it.

>  drivers/ide/mips/au1xxx-ide.c             |    2 ++
>  include/asm-mips/mach-au1x00/au1xxx_ide.h |   18 ------------------
>  2 files changed, 2 insertions(+), 18 deletions(-)

Re: [PATCH] Au1200: kill IDE driver function prototypes

[Sergei Shtylyov]

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.
> 
> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

> ---
> 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:

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

MBR, Sergei

Re: [PATCH] Au1200: kill IDE driver function prototypes

[Sergei Shtylyov]

Bartlomiej Zolnierkiewicz 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.

>>>Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

>>>---
>>>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:

>>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

> Sorry for that, I remember taking a look at au1xxx-ide-fix-mwdma-support.patch
> and it was OK

    This patch was a fitting place to get rid of that proto since it removed 
the sole call because of which that proto was needed.

> (now I see that it was au1xxx-ide-use-init_dma-method.patch that
> needed an update).  I'll fix it in today's update.

    TIA.

> Thanks,
> Bart

MBR, Sergei

Re: [PATCH] Au1200: kill IDE driver function prototypes

[Bartlomiej Zolnierkiewicz]

Hello,

On Monday 28 April 2008, Sergei Shtylyov wrote:
> 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.
> > 
> > Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> 
> > ---
> > 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:
> 
> 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

Sorry for that, I remember taking a look at au1xxx-ide-fix-mwdma-support.patch
and it was OK (now I see that it was au1xxx-ide-use-init_dma-method.patch that
needed an update).  I'll fix it in today's update.

Thanks,
Bart