[2.6 patch] drivers/cdrom/isp16.c: small cleanups

[2.6 patch] drivers/cdrom/isp16.c: small cleanups

[Adrian Bunk]

This patch makes the needlessly global function isp16_init static.

As a result, it turned out that both this function and some other code 
are only required #ifdef MODULE.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 drivers/cdrom/isp16.c |   13 ++++++++-----
 drivers/cdrom/isp16.h |    1 -
 2 files changed, 8 insertions(+), 6 deletions(-)

--- linux-2.6.11-rc2-mm1-full/drivers/cdrom/isp16.h.old	2005-01-29 16:46:18.000000000 +0100
+++ linux-2.6.11-rc2-mm1-full/drivers/cdrom/isp16.h	2005-01-29 16:47:11.000000000 +0100
@@ -71,4 +71,3 @@
 #define ISP16_IO_BASE 0xF8D
 #define ISP16_IO_SIZE 5  /* ports used from 0xF8D up to 0xF91 */
 
-int isp16_init(void);
--- linux-2.6.11-rc2-mm1-full/drivers/cdrom/isp16.c.old	2005-01-29 16:47:19.000000000 +0100
+++ linux-2.6.11-rc2-mm1-full/drivers/cdrom/isp16.c	2005-01-29 17:46:38.000000000 +0100
@@ -58,6 +58,7 @@
 #include <asm/io.h>
 #include "isp16.h"
 
+#ifdef MODULE
 static short isp16_detect(void);
 static short isp16_c928__detect(void);
 static short isp16_c929__detect(void);
@@ -66,6 +67,7 @@
 static short isp16_type;	/* dependent on type of interface card */
 static u_char isp16_ctrl;
 static u_short isp16_enable_port;
+#endif  /*  MODULE  */
 
 static int isp16_cdrom_base = ISP16_CDROM_IO_BASE;
 static int isp16_cdrom_irq = ISP16_CDROM_IRQ;
@@ -106,13 +108,13 @@
 
 __setup("isp16=", isp16_setup);
 
-#endif				/* MODULE */
+#else				/* MODULE */
 
 /*
  *  ISP16 initialisation.
  *
  */
-int __init isp16_init(void)
+static int __init isp16_init(void)
 {
 	u_char expected_drive;
 
@@ -366,15 +368,16 @@
 	return 0;
 }
 
+module_init(isp16_init);
+
+#endif
+
 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");

Re: [2.6 patch] drivers/cdrom/isp16.c: small cleanups

[Bartlomiej Zolnierkiewicz]

Hi,

On Sat, 29 Jan 2005 18:11:08 +0100, Adrian Bunk <bunk@stusta.de> wrote:
> This patch makes the needlessly global function isp16_init static.
> 
> As a result, it turned out that both this function and some other code
> are only required #ifdef MODULE.

Your patch is correct but it is wrong. ;)

#ifdefs around isp16_init() need to be removed as
otherwise this driver is not initialized in built-in case.

Bartlomiej

> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> 
> ---
> 
>  drivers/cdrom/isp16.c |   13 ++++++++-----
>  drivers/cdrom/isp16.h |    1 -
>  2 files changed, 8 insertions(+), 6 deletions(-)
> 
> --- linux-2.6.11-rc2-mm1-full/drivers/cdrom/isp16.h.old 2005-01-29 16:46:18.000000000 +0100
> +++ linux-2.6.11-rc2-mm1-full/drivers/cdrom/isp16.h     2005-01-29 16:47:11.000000000 +0100
> @@ -71,4 +71,3 @@
>  #define ISP16_IO_BASE 0xF8D
>  #define ISP16_IO_SIZE 5  /* ports used from 0xF8D up to 0xF91 */
> 
> -int isp16_init(void);
> --- linux-2.6.11-rc2-mm1-full/drivers/cdrom/isp16.c.old 2005-01-29 16:47:19.000000000 +0100
> +++ linux-2.6.11-rc2-mm1-full/drivers/cdrom/isp16.c     2005-01-29 17:46:38.000000000 +0100
> @@ -58,6 +58,7 @@
>  #include <asm/io.h>
>  #include "isp16.h"
> 
> +#ifdef MODULE
>  static short isp16_detect(void);
>  static short isp16_c928__detect(void);
>  static short isp16_c929__detect(void);
> @@ -66,6 +67,7 @@
>  static short isp16_type;       /* dependent on type of interface card */
>  static u_char isp16_ctrl;
>  static u_short isp16_enable_port;
> +#endif  /*  MODULE  */
> 
>  static int isp16_cdrom_base = ISP16_CDROM_IO_BASE;
>  static int isp16_cdrom_irq = ISP16_CDROM_IRQ;
> @@ -106,13 +108,13 @@
> 
>  __setup("isp16=", isp16_setup);
> 
> -#endif                         /* MODULE */
> +#else                          /* MODULE */
> 
>  /*
>   *  ISP16 initialisation.
>   *
>   */
> -int __init isp16_init(void)
> +static int __init isp16_init(void)
>  {
>         u_char expected_drive;
> 
> @@ -366,15 +368,16 @@
>         return 0;
>  }
> 
> +module_init(isp16_init);
> +
> +#endif
> +
>  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");
>

Re: [2.6 patch] drivers/cdrom/isp16.c: small cleanups

[Adrian Bunk]

On Sat, Jan 29, 2005 at 06:51:25PM +0100, Bartlomiej Zolnierkiewicz wrote:
> Hi,
> 
> On Sat, 29 Jan 2005 18:11:08 +0100, Adrian Bunk <bunk@stusta.de> wrote:
> > This patch makes the needlessly global function isp16_init static.
> > 
> > As a result, it turned out that both this function and some other code
> > are only required #ifdef MODULE.
> 
> Your patch is correct but it is wrong. ;)
> 
> #ifdefs around isp16_init() need to be removed as
> otherwise this driver is not initialized in built-in case.

It's somehow initialized via isp16_setup.

> Bartlomiej

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

Re: [2.6 patch] drivers/cdrom/isp16.c: small cleanups

[Bartlomiej Zolnierkiewicz]

On Sun, 30 Jan 2005 00:46:24 +0100, Adrian Bunk <bunk@stusta.de> wrote:
> On Sat, Jan 29, 2005 at 06:51:25PM +0100, Bartlomiej Zolnierkiewicz wrote:
> > Hi,
> >
> > On Sat, 29 Jan 2005 18:11:08 +0100, Adrian Bunk <bunk@stusta.de> wrote:
> > > This patch makes the needlessly global function isp16_init static.
> > >
> > > As a result, it turned out that both this function and some other code
> > > are only required #ifdef MODULE.
> >
> > Your patch is correct but it is wrong. ;)
> >
> > #ifdefs around isp16_init() need to be removed as
> > otherwise this driver is not initialized in built-in case.
> 
> It's somehow initialized via isp16_setup.

Could you explain?

AFAICS isp16_setup() only handles "isp16=" boot parameter.

[FIX] Re: [2.6 patch] drivers/cdrom/isp16.c: small cleanups

[Al Viro]

On Sun, Jan 30, 2005 at 12:54:30AM +0100, Bartlomiej Zolnierkiewicz wrote:
> On Sun, 30 Jan 2005 00:46:24 +0100, Adrian Bunk <bunk@stusta.de> wrote:
> > On Sat, Jan 29, 2005 at 06:51:25PM +0100, Bartlomiej Zolnierkiewicz wrote:
> > > Hi,
> > >
> > > On Sat, 29 Jan 2005 18:11:08 +0100, Adrian Bunk <bunk@stusta.de> wrote:
> > > > This patch makes the needlessly global function isp16_init static.
> > > >
> > > > As a result, it turned out that both this function and some other code
> > > > are only required #ifdef MODULE.

... assuming that driver had not been broken to start with

> > >
> > > Your patch is correct but it is wrong. ;)
> > >
> > > #ifdefs around isp16_init() need to be removed as
> > > otherwise this driver is not initialized in built-in case.

... assuming that driver is initialized in built-in case

> > It's somehow initialized via isp16_setup.

... assuming that magic exists, which would follow from the original
assumptions

> Could you explain?
> 
> AFAICS isp16_setup() only handles "isp16=" boot parameter.

Simple: driver is broken.  And "obvious" transformations of that sort are
safe only when they are applied to correct code.  Otherwise you end up with
obfuscation of original breakage.

Trivial check of history shows that
	a) until 2.5.1-pre1 isp16_init() had been called from blk_dev_init()
	b) in 2.5.1-pre2 Jens had taken that call out, but forgot to remove
ifdef in isp16.c
	c) nobody had cared since then.

Fix follows.

diff -u RC11-rc2-bk6-base/drivers/cdrom/isp16.c RC11-rc2-bk6-current/drivers/cdrom/isp16.c
--- RC11-rc2-bk6-base/drivers/cdrom/isp16.c	2005-01-28 17:06:37.000000000 -0500
+++ RC11-rc2-bk6-current/drivers/cdrom/isp16.c	2005-01-30 04:00:09.319617779 -0500
@@ -112,7 +112,7 @@
  *  ISP16 initialisation.
  *
  */
-int __init isp16_init(void)
+static int __init isp16_init(void)
 {
 	u_char expected_drive;
 
@@ -366,15 +366,13 @@
 	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");