4 files changed, 9 insertions, 26 deletions

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index c86a718a702..fbce2f0669d 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -281,7 +281,6 @@ static char	*stli_brdnames[] = {
 
 /*****************************************************************************/
 
-#ifdef MODULE
 /*
  *      Define some string labels for arguments passed from the module
  *      load line. These allow for easy board definitions, and easy
@@ -380,8 +379,6 @@ MODULE_PARM_DESC(board2, "Board 2 config -> name[,ioaddr[,memaddr]");
 module_param_array(board3, charp, NULL, 0);
 MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]");
 
-#endif
-
 /*
  *      Set up a default memory address table for EISA board probing.
  *      The default addresses are all bellow 1Mbyte, which has to be the
@@ -642,14 +639,8 @@ static unsigned int	stli_baudrates[] = {
  *      Prototype all functions in this driver!
  */
 
-#ifdef MODULE
-static void     stli_argbrds(void);
 static int      stli_parsebrd(stlconf_t *confp, char **argp);
-
-static unsigned long    stli_atol(char *str);
-#endif
-
-int             stli_init(void);
+static int      stli_init(void);
 static int      stli_open(struct tty_struct *tty, struct file *filp);
 static void     stli_close(struct tty_struct *tty, struct file *filp);
 static int      stli_write(struct tty_struct *tty, const unsigned char *buf, int count);
@@ -785,8 +776,6 @@ static int	stli_timeron;
 
 static struct class *istallion_class;
 
-#ifdef MODULE
-
 /*
  *      Loadable module initialization stuff.
  */
@@ -953,8 +942,6 @@ static int stli_parsebrd(stlconf_t *confp, char **argp)
         return(1);
 }
 
-#endif
-
 /*****************************************************************************/
 
 static int stli_open(struct tty_struct *tty, struct file *filp)
@@ -4693,7 +4680,7 @@ static struct tty_operations stli_ops = {
 
 /*****************************************************************************/
 
-int __init stli_init(void)
+static int __init stli_init(void)
 {
         int i;
         printk(KERN_INFO "%s: version %s\n", stli_drvtitle, stli_drvversion);
diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c
index 1c706ccfdbb..c860de6a6fd 100644
--- a/drivers/char/pc8736x_gpio.c
+++ b/drivers/char/pc8736x_gpio.c
@@ -319,9 +319,10 @@ static int __init pc8736x_gpio_init(void)
         return 0;
 
 undo_platform_dev_add:
-        platform_device_put(pdev);
+        platform_device_del(pdev);
 undo_platform_dev_alloc:
-        kfree(pdev);
+        platform_device_put(pdev);
+
         return rc;
 }
 
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index eab5394da66..31c8a21f9d8 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -149,12 +149,7 @@ struct cm4000_dev {
 #define ZERO_DEV(dev)                                           \
         memset(&dev->atr_csum,0,                                \
                 sizeof(struct cm4000_dev) -                     \
-                /*link*/ sizeof(struct pcmcia_device *) -       \
-                /*node*/ sizeof(dev_node_t) -                   \
-                /*atr*/ MAX_ATR*sizeof(char) -                  \
-                /*rbuf*/ 512*sizeof(char) -                     \
-                /*sbuf*/ 512*sizeof(char) -                     \
-                /*queue*/ 4*sizeof(wait_queue_head_t))
+                offsetof(struct cm4000_dev, atr_csum))
 
 static struct pcmcia_device *dev_table[CM4000_MAX_DEV];
 static struct class *cmm_class;
diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c
index 5a280a33040..45083e5dd23 100644
--- a/drivers/char/scx200_gpio.c
+++ b/drivers/char/scx200_gpio.c
@@ -126,9 +126,10 @@ static int __init scx200_gpio_init(void)
 undo_chrdev_region:
         unregister_chrdev_region(dev, num_pins);
 undo_platform_device_add:
-        platform_device_put(pdev);
+        platform_device_del(pdev);
 undo_malloc:
-        kfree(pdev);
+        platform_device_put(pdev);
+
         return rc;
 }
 
@@ -136,7 +137,6 @@ static void __exit scx200_gpio_cleanup(void)
 {
         kfree(scx200_devices);
         unregister_chrdev_region(MKDEV(major, 0), num_pins);
-        platform_device_put(pdev);
         platform_device_unregister(pdev);
         /* kfree(pdev); */
 }