Skip to contentSkip to conversation

drivers/scsi/qla2xxx/: cleanups

PATCH In review Adrian Bunk 3 participants 4 messages Feb 28, 2005

Subsystems (2)
SCSI QLogic QLA2XXX FC-SCSI driver
lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 drivers/scsi/qla2xxx/: cleanups

This patch contains the following cleanups:
- make needlessly global code static
- kill the unused global *_version and *_version_str variables in the firmware files

Signed-off-by Adrian Bunk <[email protected]>

---

 drivers/scsi/qla2xxx/ql2100.c     |    2 
 drivers/scsi/qla2xxx/ql2100_fw.c  |   12 -----
 drivers/scsi/qla2xxx/ql2200.c     |    2 
 drivers/scsi/qla2xxx/ql2200_fw.c  |   12 -----
 drivers/scsi/qla2xxx/ql2300.c     |    2 
 drivers/scsi/qla2xxx/ql2300_fw.c  |   12 -----
 drivers/scsi/qla2xxx/ql2322.c     |    2 
 drivers/scsi/qla2xxx/ql2322_fw.c  |   12 -----
 drivers/scsi/qla2xxx/ql6312.c     |    2 
 drivers/scsi/qla2xxx/ql6312_fw.c  |   12 -----
 drivers/scsi/qla2xxx/qla_gbl.h    |    8 ---
 drivers/scsi/qla2xxx/qla_inline.h |   49 ---------------------
 drivers/scsi/qla2xxx/qla_os.c     |   68 ++++++++++++++++++++++++------
 13 files changed, 56 insertions(+), 139 deletions(-)
drivers/scsi/qla2xxx/ql2100_fw.c renamed from drivers/scsi/qla2xxx/ql2100_fw.c.old +0 -12
@@ -22,18 +22,6 @@
  */
 
 #ifdef UNIQUE_FW_NAME
-unsigned short fw2100tp_version = 1*1024+19;
-#else
-unsigned short risc_code_version = 1*1024+19;
-#endif
-
-#ifdef UNIQUE_FW_NAME
-unsigned char fw2100tp_version_str[] = {1,19,24};
-#else
-unsigned char firmware_version[] = {1,19,24};
-#endif
-
-#ifdef UNIQUE_FW_NAME
 #define fw2100tp_VERSION_STRING "1.19.24"
 #else
 #define FW_VERSION_STRING "1.19.24"
drivers/scsi/qla2xxx/ql2100.c renamed from drivers/scsi/qla2xxx/ql2100.c.old +0 -2
@@ -14,8 +14,6 @@
 
 static char qla_driver_name[] = "qla2100";
 
-extern unsigned char  fw2100tp_version[];
-extern unsigned char  fw2100tp_version_str[];
 extern unsigned short fw2100tp_addr01;
 extern unsigned short fw2100tp_code01[];
 extern unsigned short fw2100tp_length01;
drivers/scsi/qla2xxx/ql2200_fw.c renamed from drivers/scsi/qla2xxx/ql2200_fw.c.old +0 -12
@@ -22,18 +22,6 @@
  */
 
 #ifdef UNIQUE_FW_NAME
-unsigned short fw2200tp_version = 2*1024+2;
-#else
-unsigned short risc_code_version = 2*1024+2;
-#endif
-
-#ifdef UNIQUE_FW_NAME
-unsigned char fw2200tp_version_str[] = {2,2,6};
-#else
-unsigned char firmware_version[] = {2,2,6};
-#endif
-
-#ifdef UNIQUE_FW_NAME
 #define fw2200tp_VERSION_STRING "2.02.06"
 #else
 #define FW_VERSION_STRING "2.02.06"
drivers/scsi/qla2xxx/ql2200.c renamed from drivers/scsi/qla2xxx/ql2200.c.old +0 -2
@@ -14,8 +14,6 @@
 
 static char qla_driver_name[] = "qla2200";
 
-extern unsigned char  fw2200tp_version[];
-extern unsigned char  fw2200tp_version_str[];
 extern unsigned short fw2200tp_addr01;
 extern unsigned short fw2200tp_code01[];
 extern unsigned short fw2200tp_length01;
drivers/scsi/qla2xxx/ql2300.c renamed from drivers/scsi/qla2xxx/ql2300.c.old +0 -2
@@ -14,8 +14,6 @@
 
 static char qla_driver_name[] = "qla2300";
 
-extern unsigned char  fw2300ipx_version[];
-extern unsigned char  fw2300ipx_version_str[];
 extern unsigned short fw2300ipx_addr01;
 extern unsigned short fw2300ipx_code01[];
 extern unsigned short fw2300ipx_length01;
drivers/scsi/qla2xxx/ql2300_fw.c renamed from drivers/scsi/qla2xxx/ql2300_fw.c.old +0 -12
@@ -22,18 +22,6 @@
  */
 
 #ifdef UNIQUE_FW_NAME
-unsigned short fw2300ipx_version = 3*1024+3;
-#else
-unsigned short risc_code_version = 3*1024+3;
-#endif
-
-#ifdef UNIQUE_FW_NAME
-unsigned char fw2300ipx_version_str[] = {3, 3, 8};
-#else
-unsigned char firmware_version[] = {3, 3, 8};
-#endif
-
-#ifdef UNIQUE_FW_NAME
 #define fw2300ipx_VERSION_STRING "3.03.08"
 #else
 #define FW_VERSION_STRING "3.03.08"
drivers/scsi/qla2xxx/ql2322_fw.c renamed from drivers/scsi/qla2xxx/ql2322_fw.c.old +0 -12
@@ -22,18 +22,6 @@
  */
 
 #ifdef UNIQUE_FW_NAME
-unsigned short fw2322ipx_version = 3*1024+3;
-#else
-unsigned short risc_code_version = 3*1024+3;
-#endif
-
-#ifdef UNIQUE_FW_NAME
-unsigned char fw2322ipx_version_str[] = {3, 3, 8};
-#else
-unsigned char firmware_version[] = {3, 3, 8};
-#endif
-
-#ifdef UNIQUE_FW_NAME
 #define fw2322ipx_VERSION_STRING "3.03.08"
 #else
 #define FW_VERSION_STRING "3.03.08"
drivers/scsi/qla2xxx/ql2322.c renamed from drivers/scsi/qla2xxx/ql2322.c.old +0 -2
@@ -13,8 +13,6 @@
 
 static char qla_driver_name[] = "qla2322";
 
-extern unsigned char  fw2322ipx_version[];
-extern unsigned char  fw2322ipx_version_str[];
 extern unsigned short fw2322ipx_addr01;
 extern unsigned short fw2322ipx_code01[];
 extern unsigned short fw2322ipx_length01;
drivers/scsi/qla2xxx/ql6312_fw.c renamed from drivers/scsi/qla2xxx/ql6312_fw.c.old +0 -12
@@ -22,18 +22,6 @@
  */
 
 #ifdef UNIQUE_FW_NAME
-unsigned short fw2300flx_version = 3*1024+3;
-#else
-unsigned short risc_code_version = 3*1024+3;
-#endif
-
-#ifdef UNIQUE_FW_NAME
-unsigned char fw2300flx_version_str[] = {3, 3, 8};
-#else
-unsigned char firmware_version[] = {3, 3, 8};
-#endif
-
-#ifdef UNIQUE_FW_NAME
 #define fw2300flx_VERSION_STRING "3.03.08"
 #else
 #define FW_VERSION_STRING "3.03.08"
drivers/scsi/qla2xxx/ql6312.c renamed from drivers/scsi/qla2xxx/ql6312.c.old +0 -2
@@ -13,8 +13,6 @@
 
 static char qla_driver_name[] = "qla6312";
 
-extern unsigned char  fw2300flx_version[];
-extern unsigned char  fw2300flx_version_str[];
 extern unsigned short fw2300flx_addr01;
 extern unsigned short fw2300flx_code01[];
 extern unsigned short fw2300flx_length01;
drivers/scsi/qla2xxx/qla_gbl.h renamed from drivers/scsi/qla2xxx/qla_gbl.h.old +0 -8
@@ -53,15 +53,9 @@
  */
 extern char qla2x00_version_str[];
 
-extern int num_hosts;
-extern int apiHBAInstance;
-
 extern struct _qla2x00stats qla2x00_stats;
-extern int ql2xretrycount;
 extern int ql2xlogintimeout;
 extern int qlport_down_retry;
-extern int ql2xmaxqdepth;
-extern int displayConfig;
 extern int ql2xplogiabsentdevice;
 extern int ql2xenablezio;
 extern int ql2xintrdelaytimer;

@@ -77,8 +71,6 @@
 
 extern char *qla2x00_get_fw_version_str(struct scsi_qla_host *, char *);
 
-extern void qla2x00_cmd_timeout(srb_t *);
-
 extern int __qla2x00_suspend_lun(scsi_qla_host_t *, os_lun_t *, int, int, int);
 
 extern void qla2x00_done(scsi_qla_host_t *);
drivers/scsi/qla2xxx/qla_inline.h renamed from drivers/scsi/qla2xxx/qla_inline.h.old +0 -49

52 lines not on this page · raw message

drivers/scsi/qla2xxx/qla_os.c renamed from drivers/scsi/qla2xxx/qla_os.c.old +56 -12

131 lines not on this page · raw message

#1 lore raw
Quoted 4 lines · Adrian Bunk

This patch contains the following cleanups:
- make needlessly global code static
- kill the unused global *_version and *_version_str variables in the firmware files

The firmware files are generated, so it'd be better to leave them alone.

author
#2 lore raw
Quoted 8 lines · Christoph Hellwig
Quoted 4 lines · Adrian Bunk

This patch contains the following cleanups:
- make needlessly global code static
- kill the unused global *_version and *_version_str variables in the firmware files

The firmware files are generated, so it'd be better to leave them alone.

Agreed.

But can't the generation of these files omit these needless variables (there are already #define's containing the version information)?

cu
Adrian

Signature · 4 lines
       "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
#3 lore raw
In reply to Adrian Bunk
Quoted 2 lines · Adrian Bunk

This patch contains the following cleanups:
- make needlessly global code static

As Christoph mentioned, the firmware images are auto-generated, so I'd rather hold off on those deltas. Besides, I'm hoping in the near future to drop the firmware from the distribution and begin to use the request_firmware() interface exclusively.

Quoted 3 lines

- kill the unused global *_version and *_version_str variables in the firmware files

The driver is also going through some significant overhauling with the fc_remote_port stuffs -- where most internal queueing is stripped from the driver.

Quoted 38 lines
drivers/scsi/qla2xxx/qla_inline.h renamed from drivers/scsi/qla2xxx/qla_inline.h.old +0 -38
-static __inline__ void qla2x00_add_timer_to_cmd(srb_t *, int);
-static __inline__ void qla2x00_delete_timer_from_cmd(srb_t *);
-
-/**************************************************************************
-*   qla2x00_add_timer_to_cmd
-*
-* Description:
-*       Creates a timer for the specified command. The timeout is usually
-*       the command time from kernel minus 2 secs.
-*
-* Input:
-*     sp - pointer to validate
-*
-* Returns:
-*     None.
-**************************************************************************/
-static inline void
-qla2x00_add_timer_to_cmd(srb_t *sp, int timeout)
-{
-	init_timer(&sp->timer);
-	sp->timer.expires = jiffies + timeout * HZ;
-	sp->timer.data = (unsigned long) sp;
-	sp->timer.function = (void (*) (unsigned long))qla2x00_cmd_timeout;
-	add_timer(&sp->timer);
-}
-
-/**************************************************************************
-*   qla2x00_delete_timer_from_cmd
-*
-* Description:
-*       Delete the timer for the specified command.
-*
-* Input:
-*     sp - pointer to validate
-*
-* Returns:
-*     None.
-**************************************************************************/

drivers/scsi/qla2xxx/qla_inline.h line 292

Quoted 10 lines
drivers/scsi/qla2xxx/qla_inline.h renamed from drivers/scsi/qla2xxx/qla_inline.h.old +0 -10
-static inline void 
-qla2x00_delete_timer_from_cmd(srb_t *sp)
-{
-	if (sp->timer.function != NULL) {
-		del_timer(&sp->timer);
-		sp->timer.function =  NULL;
-		sp->timer.data = (unsigned long) NULL;
-	}
-}
-

these codes will be dropped from the driver.

drivers/scsi/qla2xxx/qla_os.c

Quoted 61 lines

/*
* SRB allocation cache
*/

drivers/scsi/qla2xxx/qla_os.c renamed from drivers/scsi/qla2xxx/qla_os.c.old +8 -9
-char srb_cachep_name[16];
-kmem_cache_t *srb_cachep;
+static char srb_cachep_name[16];
+static kmem_cache_t *srb_cachep;
 
 /*
  * Stats for all adpaters.

@@ -47,13 +47,12 @@
 /*
  * Ioctl related information.
  */
-int num_hosts;
-int apiHBAInstance;
+static int num_hosts;
 
 /*
  * Module parameter information and variables
  */
-int ql2xmaxqdepth;
+static int ql2xmaxqdepth;
 module_param(ql2xmaxqdepth, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(ql2xmaxqdepth,
 		"Maximum queue depth to report for target devices.");

@@ -69,13 +68,13 @@
 		"Maximum number of command retries to a port that returns"
 		"a PORT-DOWN status.");
 
-int ql2xretrycount = 20;
+static int ql2xretrycount = 20;
 module_param(ql2xretrycount, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(ql2xretrycount,
 		"Maximum number of mid-layer retries allowed for a command.  "
 		"Default value is 20, ");
 
-int displayConfig;
+static int displayConfig;
 module_param(displayConfig, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(displayConfig,
 		"If 1 then display the configuration used in /etc/modprobe.conf.");

@@ -100,7 +99,7 @@
 		"ZIO: Waiting time for Firmware before it generates an "
 		"interrupt to the host to notify completion of request.");
 
-int ConfigRequired;
+static int ConfigRequired;
 module_param(ConfigRequired, int, S_IRUGO|S_IRUSR);
 MODULE_PARM_DESC(ConfigRequired,
 		"If 1, then only configured devices passed in through the"

@@ -119,7 +118,7 @@
 		"target returns a <NOT READY> status.  Default is 10 "
 		"iterations.");
 
-int ql2xdoinitscan = 1;
+static int ql2xdoinitscan = 1;
 module_param(ql2xdoinitscan, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(ql2xdoinitscan,
 		"Signal mid-layer to perform scan after driver load: 0 -- no "

@@ -163,6 +162,8 @@

I'll queue-up these for the next set of patches.

Thanks,
Andrew Vasquez