Re: [2.6 patch] drivers/scsi/qla2xxx/: cleanups

[Andrew Vasquez <andrew.vasquez@qlogic.com>]

On Mon, 28 Feb 2005, Adrian Bunk wrote:

> 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.

> - 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.  

> -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.
> -**************************************************************************/
> -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.

>  /*
>   * SRB allocation cache
>   */
> -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