[2.6 patch] scsi/aic7xxx/ : remove two useless variables (fwd)

[Adrian Bunk]

The patch forwarded below still applies and compiles against 
2.6.10-rc3-mm1.

Please apply.


----- Forwarded message from Adrian Bunk <bunk@xxxxxxxxx> -----

Date:	Wed, 8 Dec 2004 02:14:50 +0100
From: Adrian Bunk <bunk@xxxxxxxxx>
To: James.Bottomley@xxxxxxxxxxxx
Cc: linux-scsi@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx
Subject: [2.6 patch] scsi/aic7xxx/ : remove two useless variables

The patch below removes two useless variables.


diffstat output:
 drivers/scsi/aic7xxx/aic79xx_osm.c |   12 ------------
 drivers/scsi/aic7xxx/aic7xxx_osm.c |   12 ------------
 2 files changed, 24 deletions(-)


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.10-rc2-mm4-full/drivers/scsi/aic7xxx/aic7xxx_osm.c.old	2004-12-08 01:06:02.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/drivers/scsi/aic7xxx/aic7xxx_osm.c	2004-12-08 01:06:15.000000000 +0100
@@ -427,12 +427,6 @@
  * Module information and settable options.
  */
 static char *aic7xxx = NULL;
-/*
- * Just in case someone uses commas to separate items on the insmod
- * command line, we define a dummy buffer here to avoid having insmod
- * write wild stuff into our code segment
- */
-static char dummy_buffer[60] = "Please don't trounce on me insmod!!\n";
 
 MODULE_AUTHOR("Maintainer: Justin T. Gibbs <gibbs@xxxxxxxxxxx>");
 MODULE_DESCRIPTION("Adaptec Aic77XX/78XX SCSI Host Bus Adapter driver");
@@ -850,12 +844,6 @@
 	 */
 	if (aic7xxx)
 		aic7xxx_setup(aic7xxx);
-	if (dummy_buffer[0] != 'P')
-		printk(KERN_WARNING
-"aic7xxx: Please read the file /usr/src/linux/drivers/scsi/README.aic7xxx\n"
-"aic7xxx: to see the proper way to specify options to the aic7xxx module\n"
-"aic7xxx: Specifically, don't use any commas when passing arguments to\n"
-"aic7xxx: insmod or else it might trash certain memory areas.\n");
 
 	template->proc_name = "aic7xxx";
 
--- linux-2.6.10-rc2-mm4-full/drivers/scsi/aic7xxx/aic79xx_osm.c.old	2004-12-08 01:06:25.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/drivers/scsi/aic7xxx/aic79xx_osm.c	2004-12-08 01:06:42.000000000 +0100
@@ -407,12 +407,6 @@
  * Module information and settable options.
  */
 static char *aic79xx = NULL;
-/*
- * Just in case someone uses commas to separate items on the insmod
- * command line, we define a dummy buffer here to avoid having insmod
- * write wild stuff into our code segment
- */
-static char dummy_buffer[60] = "Please don't trounce on me insmod!!\n";
 
 MODULE_AUTHOR("Maintainer: Justin T. Gibbs <gibbs@xxxxxxxxxxx>");
 MODULE_DESCRIPTION("Adaptec Aic790X U320 SCSI Host Bus Adapter driver");
@@ -835,12 +829,6 @@
 	 */
 	if (aic79xx)
 		aic79xx_setup(aic79xx);
-	if (dummy_buffer[0] != 'P')
-		printk(KERN_WARNING
-"aic79xx: Please read the file /usr/src/linux/drivers/scsi/README.aic79xx\n"
-"aic79xx: to see the proper way to specify options to the aic79xx module\n"
-"aic79xx: Specifically, don't use any commas when passing arguments to\n"
-"aic79xx: insmod or else it might trash certain memory areas.\n");
 #endif
 
 	template->proc_name = "aic79xx";

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

----- End forwarded message -----

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