Browse Source

arm ide breakage

a) semicolon before the function body is a bad idea
b) it's const struct foo, not struct const foo
c) incidentally, it's ecard_remove_driver(), not ecard_unregister_driver()
d) compiling is occasionally useful.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Al Viro 16 years ago
parent
commit
1137fb6704
2 changed files with 4 additions and 4 deletions
  1. 2 2
      drivers/ide/icside.c
  2. 2 2
      drivers/ide/rapide.c

+ 2 - 2
drivers/ide/icside.c

@@ -690,9 +690,9 @@ static int __init icside_init(void)
 	return ecard_register_driver(&icside_driver);
 	return ecard_register_driver(&icside_driver);
 }
 }
 
 
-static void __exit icside_exit(void);
+static void __exit icside_exit(void)
 {
 {
-	ecard_unregister_driver(&icside_driver);
+	ecard_remove_driver(&icside_driver);
 }
 }
 
 
 MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
 MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");

+ 2 - 2
drivers/ide/rapide.c

@@ -11,7 +11,7 @@
 
 
 #include <asm/ecard.h>
 #include <asm/ecard.h>
 
 
-static struct const ide_port_info rapide_port_info = {
+static const struct ide_port_info rapide_port_info = {
 	.host_flags		= IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,
 	.host_flags		= IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,
 };
 };
 
 
@@ -97,7 +97,7 @@ static int __init rapide_init(void)
 
 
 static void __exit rapide_exit(void)
 static void __exit rapide_exit(void)
 {
 {
-	ecard_unregister_driver(&rapide_driver);
+	ecard_remove_driver(&rapide_driver);
 }
 }
 
 
 MODULE_LICENSE("GPL");
 MODULE_LICENSE("GPL");