[PATCH] isp16 missing initcalls

 * isp16_init() should be an initcall in non-modular case - it's not
   called directly anymore (not since 2.5.1-pre2).
 * isp16_init() and isp16_exit() made static, while we are at it.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/cdrom/isp16.c b/drivers/cdrom/isp16.c
index 6746cfea55eb7a0d47a94038f3774355dcfd3c96..8e68d858ce64aa9cb9ba8530503b9413f07413e2 100644 (file)
--- a/drivers/cdrom/isp16.c
+++ b/drivers/cdrom/isp16.c
@@ -77,10 +77,6 @@ module_param(isp16_cdrom_irq, int, 0);
 module_param(isp16_cdrom_dma, int, 0);
 module_param(isp16_cdrom_type, charp, 0);
 
-#ifdef MODULE
-void isp16_exit(void);
-#endif
-
 #define ISP16_IN(p) (outb(isp16_ctrl,ISP16_CTRL_PORT), inb(p))
 #define ISP16_OUT(p,b) (outb(isp16_ctrl,ISP16_CTRL_PORT), outb(b,p))
 
@@ -112,7 +108,7 @@ __setup("isp16=", isp16_setup);
  *  ISP16 initialisation.
  *
  */
-int __init isp16_init(void)
+static int __init isp16_init(void)
 {
        u_char expected_drive;
 
@@ -366,15 +362,13 @@ isp16_cdi_config(int base, u_char drive_type, int irq, int dma)
        return 0;
 }
 
-void __exit isp16_exit(void)
+static void __exit isp16_exit(void)
 {
        release_region(ISP16_IO_BASE, ISP16_IO_SIZE);
        printk(KERN_INFO "ISP16: module released.\n");
 }
 
-#ifdef MODULE
 module_init(isp16_init);
-#endif
 module_exit(isp16_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/drivers/cdrom/isp16.h b/drivers/cdrom/isp16.h
index 7fc74b8e49f1112c9341b7a586896bea919add29..5bd22c8f7a968f0fd555b37a029581f38aaaf9aa 100644 (file)
--- a/drivers/cdrom/isp16.h
+++ b/drivers/cdrom/isp16.h
@@ -70,5 +70,3 @@
 
 #define ISP16_IO_BASE 0xF8D
 #define ISP16_IO_SIZE 5  /* ports used from 0xF8D up to 0xF91 */
-
-int isp16_init(void);