Re: ide/arm/bast-ide.c compile error

2008-02-10 Thread Russell King
FYI, from maintainers:

SIMTEC EB2410ITX (BAST)
P:  Ben Dooks
P:  Vincent Sanders
M:  [EMAIL PROTECTED]
W:  http://www.simtec.co.uk/products/EB2410ITX/
S:  Supported

On Sat, Feb 09, 2008 at 02:15:15AM +0200, Adrian Bunk wrote:
> Commit 9e016a719209d95338e314b46c3012cc7feaaeec causes the following 
> compile error:
> 
> <--  snip  -->
> 
> ...
>   CC  drivers/ide/arm/bast-ide.o
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c: In 
> function 'bastide_register':
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:31: 
> error: 'hwif' redeclared as different kind of symbol
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:29: 
> error: previous definition of 'hwif' was here
> make[4]: *** [drivers/ide/arm/bast-ide.o] Error 1
> 
> <--  snip  -->
> 
> cu
> Adrian
> 
> -- 
> 
>"Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
>"Only a promise," Lao Er said.
>Pearl S. Buck - Dragon Seed
> 

-- 
Russell King
 Linux kernel2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: ide/arm/bast-ide.c compile error

2008-02-10 Thread Russell King
FYI, from maintainers:

SIMTEC EB2410ITX (BAST)
P:  Ben Dooks
P:  Vincent Sanders
M:  [EMAIL PROTECTED]
W:  http://www.simtec.co.uk/products/EB2410ITX/
S:  Supported

On Sat, Feb 09, 2008 at 02:15:15AM +0200, Adrian Bunk wrote:
 Commit 9e016a719209d95338e314b46c3012cc7feaaeec causes the following 
 compile error:
 
 --  snip  --
 
 ...
   CC  drivers/ide/arm/bast-ide.o
 /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c: In 
 function 'bastide_register':
 /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:31: 
 error: 'hwif' redeclared as different kind of symbol
 /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:29: 
 error: previous definition of 'hwif' was here
 make[4]: *** [drivers/ide/arm/bast-ide.o] Error 1
 
 --  snip  --
 
 cu
 Adrian
 
 -- 
 
Is there not promise of rain? Ling Tan asked suddenly out
 of the darkness. There had been need of rain for many days.
Only a promise, Lao Er said.
Pearl S. Buck - Dragon Seed
 

-- 
Russell King
 Linux kernel2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: ide/arm/bast-ide.c compile error

2008-02-09 Thread Sergei Shtylyov

Bartlomiej Zolnierkiewicz wrote:


Remove 'ide_hwif_t **hwif' argument from bastide_register()
(together with write-only ifs[]).



Cc: Adrian Bunk <[EMAIL PROTECTED]>
Cc: Russell King <[EMAIL PROTECTED]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>


Acked-by: Sergei Shtylyov <[EMAIL PROTECTED]>

MBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: ide/arm/bast-ide.c compile error

2008-02-09 Thread Bartlomiej Zolnierkiewicz
On Saturday 09 February 2008, Adrian Bunk wrote:
> Commit 9e016a719209d95338e314b46c3012cc7feaaeec causes the following 
> compile error:
> 
> <--  snip  -->
> 
> ...
>   CC  drivers/ide/arm/bast-ide.o
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c: In 
> function 'bastide_register':
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:31: 
> error: 'hwif' redeclared as different kind of symbol
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:29: 
> error: previous definition of 'hwif' was here
> make[4]: *** [drivers/ide/arm/bast-ide.o] Error 1
> 
> <--  snip  -->

OK, I suck big time...

I didn't try to compile bast-ide ARM host driver and I overlooked this:

static int __init
bastide_register(unsigned int base, unsigned int aux, int irq,
 ide_hwif_t **hwif)
{
ide_hwif_t *hwif;

patch below...


From: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
Subject: [PATCH] bast-ide: build fix

On Saturday 09 February 2008, Adrian Bunk wrote:
> Commit 9e016a719209d95338e314b46c3012cc7feaaeec causes the following 
> compile error:
> 
> <--  snip  -->
> 
> ...
>   CC  drivers/ide/arm/bast-ide.o
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c: In 
> function 'bastide_register':
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:31: 
> error: 'hwif' redeclared as different kind of symbol
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:29: 
> error: previous definition of 'hwif' was here
> make[4]: *** [drivers/ide/arm/bast-ide.o] Error 1
> 
> <--  snip  -->

Remove 'ide_hwif_t **hwif' argument from bastide_register()
(together with write-only ifs[]).

Cc: Adrian Bunk <[EMAIL PROTECTED]>
Cc: Russell King <[EMAIL PROTECTED]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/arm/bast-ide.c |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

Index: b/drivers/ide/arm/bast-ide.c
===
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -21,12 +21,7 @@
 #include 
 #include 
 
-/* list of registered interfaces */
-static ide_hwif_t *ifs[2];
-
-static int __init
-bastide_register(unsigned int base, unsigned int aux, int irq,
-ide_hwif_t **hwif)
+static int __init bastide_register(unsigned int base, unsigned int aux, int 
irq)
 {
ide_hwif_t *hwif;
hw_regs_t hw;
@@ -76,8 +71,9 @@ static int __init bastide_init(void)
 
printk("BAST: IDE driver, (c) 2003-2004 Simtec Electronics\n");
 
-   bastide_register(BAST_VA_IDEPRI, BAST_VA_IDEPRIAUX, IRQ_IDE0, [0]);
-   bastide_register(BAST_VA_IDESEC, BAST_VA_IDESECAUX, IRQ_IDE1, [1]);
+   bastide_register(BAST_VA_IDEPRI, BAST_VA_IDEPRIAUX, IRQ_IDE0);
+   bastide_register(BAST_VA_IDESEC, BAST_VA_IDESECAUX, IRQ_IDE1);
+
return 0;
 }
 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: ide/arm/bast-ide.c compile error

2008-02-09 Thread Bartlomiej Zolnierkiewicz
On Saturday 09 February 2008, Adrian Bunk wrote:
 Commit 9e016a719209d95338e314b46c3012cc7feaaeec causes the following 
 compile error:
 
 --  snip  --
 
 ...
   CC  drivers/ide/arm/bast-ide.o
 /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c: In 
 function 'bastide_register':
 /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:31: 
 error: 'hwif' redeclared as different kind of symbol
 /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:29: 
 error: previous definition of 'hwif' was here
 make[4]: *** [drivers/ide/arm/bast-ide.o] Error 1
 
 --  snip  --

OK, I suck big time...

I didn't try to compile bast-ide ARM host driver and I overlooked this:

static int __init
bastide_register(unsigned int base, unsigned int aux, int irq,
 ide_hwif_t **hwif)
{
ide_hwif_t *hwif;

patch below...


From: Bartlomiej Zolnierkiewicz [EMAIL PROTECTED]
Subject: [PATCH] bast-ide: build fix

On Saturday 09 February 2008, Adrian Bunk wrote:
 Commit 9e016a719209d95338e314b46c3012cc7feaaeec causes the following 
 compile error:
 
 --  snip  --
 
 ...
   CC  drivers/ide/arm/bast-ide.o
 /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c: In 
 function 'bastide_register':
 /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:31: 
 error: 'hwif' redeclared as different kind of symbol
 /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:29: 
 error: previous definition of 'hwif' was here
 make[4]: *** [drivers/ide/arm/bast-ide.o] Error 1
 
 --  snip  --

Remove 'ide_hwif_t **hwif' argument from bastide_register()
(together with write-only ifs[]).

Cc: Adrian Bunk [EMAIL PROTECTED]
Cc: Russell King [EMAIL PROTECTED]
Signed-off-by: Bartlomiej Zolnierkiewicz [EMAIL PROTECTED]
---
 drivers/ide/arm/bast-ide.c |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

Index: b/drivers/ide/arm/bast-ide.c
===
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -21,12 +21,7 @@
 #include asm/arch/bast-map.h
 #include asm/arch/bast-irq.h
 
-/* list of registered interfaces */
-static ide_hwif_t *ifs[2];
-
-static int __init
-bastide_register(unsigned int base, unsigned int aux, int irq,
-ide_hwif_t **hwif)
+static int __init bastide_register(unsigned int base, unsigned int aux, int 
irq)
 {
ide_hwif_t *hwif;
hw_regs_t hw;
@@ -76,8 +71,9 @@ static int __init bastide_init(void)
 
printk(BAST: IDE driver, (c) 2003-2004 Simtec Electronics\n);
 
-   bastide_register(BAST_VA_IDEPRI, BAST_VA_IDEPRIAUX, IRQ_IDE0, ifs[0]);
-   bastide_register(BAST_VA_IDESEC, BAST_VA_IDESECAUX, IRQ_IDE1, ifs[1]);
+   bastide_register(BAST_VA_IDEPRI, BAST_VA_IDEPRIAUX, IRQ_IDE0);
+   bastide_register(BAST_VA_IDESEC, BAST_VA_IDESECAUX, IRQ_IDE1);
+
return 0;
 }
 

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: ide/arm/bast-ide.c compile error

2008-02-09 Thread Sergei Shtylyov

Bartlomiej Zolnierkiewicz wrote:


Remove 'ide_hwif_t **hwif' argument from bastide_register()
(together with write-only ifs[]).



Cc: Adrian Bunk [EMAIL PROTECTED]
Cc: Russell King [EMAIL PROTECTED]
Signed-off-by: Bartlomiej Zolnierkiewicz [EMAIL PROTECTED]


Acked-by: Sergei Shtylyov [EMAIL PROTECTED]

MBR, Sergei
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


ide/arm/bast-ide.c compile error

2008-02-08 Thread Adrian Bunk
Commit 9e016a719209d95338e314b46c3012cc7feaaeec causes the following 
compile error:

<--  snip  -->

...
  CC  drivers/ide/arm/bast-ide.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c: In 
function 'bastide_register':
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:31: error: 
'hwif' redeclared as different kind of symbol
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:29: error: 
previous definition of 'hwif' was here
make[4]: *** [drivers/ide/arm/bast-ide.o] Error 1

<--  snip  -->

cu
Adrian

-- 

   "Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
   "Only a promise," Lao Er said.
   Pearl S. Buck - Dragon Seed

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


ide/arm/bast-ide.c compile error

2008-02-08 Thread Adrian Bunk
Commit 9e016a719209d95338e314b46c3012cc7feaaeec causes the following 
compile error:

--  snip  --

...
  CC  drivers/ide/arm/bast-ide.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c: In 
function 'bastide_register':
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:31: error: 
'hwif' redeclared as different kind of symbol
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:29: error: 
previous definition of 'hwif' was here
make[4]: *** [drivers/ide/arm/bast-ide.o] Error 1

--  snip  --

cu
Adrian

-- 

   Is there not promise of rain? Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
   Only a promise, Lao Er said.
   Pearl S. Buck - Dragon Seed

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/