Subject: Re: [PATCH 15/31] Constify struct iwl_ops for 2.6.32 v1

From: Emese Revfy <[email-masked]>
Date: Sat, 05 Dec 2009 00:05:47 +0100

Added [email-masked] and [email-masked] to CC.
> From: Emese Revfy <[email-masked]>
> 
> Constify struct iwl_ops.
> 
> Signed-off-by: Emese Revfy <[email-masked]>
> ---
>  drivers/net/wireless/iwlwifi/iwl-1000.c |    2 +-
>  drivers/net/wireless/iwlwifi/iwl-3945.c |    2 +-
>  drivers/net/wireless/iwlwifi/iwl-4965.c |    2 +-
>  drivers/net/wireless/iwlwifi/iwl-5000.c |    4 ++--
>  drivers/net/wireless/iwlwifi/iwl-6000.c |    2 +-
>  drivers/net/wireless/iwlwifi/iwl-dev.h  |    2 +-
>  6 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
> index 950267a..80d5fd2 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-1000.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
> @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = {
>  	 },
>  };
>  
> -static struct iwl_ops iwl1000_ops = {
> +static const struct iwl_ops iwl1000_ops = {
>  	.ucode = &iwl5000_ucode,
>  	.lib = &iwl1000_lib,
>  	.hcmd = &iwl5000_hcmd,
> diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
> index f059b49..fe90e0a 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-3945.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
> @@ -2876,7 +2876,7 @@ static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {
>  	.build_addsta_hcmd = iwl3945_build_addsta_hcmd,
>  };
>  
> -static struct iwl_ops iwl3945_ops = {
> +static const struct iwl_ops iwl3945_ops = {
>  	.ucode = &iwl3945_ucode,
>  	.lib = &iwl3945_lib,
>  	.hcmd = &iwl3945_hcmd,
> diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
> index 6f703a0..b7c4e48 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-4965.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
> @@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib = {
>  	},
>  };
>  
> -static struct iwl_ops iwl4965_ops = {
> +static const struct iwl_ops iwl4965_ops = {
>  	.ucode = &iwl4965_ucode,
>  	.lib = &iwl4965_lib,
>  	.hcmd = &iwl4965_hcmd,
> diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
> index 6e6f516..0ec1f24 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-5000.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
> @@ -1627,14 +1627,14 @@ static struct iwl_lib_ops iwl5150_lib = {
>  	 },
>  };
>  
> -struct iwl_ops iwl5000_ops = {
> +const struct iwl_ops iwl5000_ops = {
>  	.ucode = &iwl5000_ucode,
>  	.lib = &iwl5000_lib,
>  	.hcmd = &iwl5000_hcmd,
>  	.utils = &iwl5000_hcmd_utils,
>  };
>  
> -static struct iwl_ops iwl5150_ops = {
> +static const struct iwl_ops iwl5150_ops = {
>  	.ucode = &iwl5000_ucode,
>  	.lib = &iwl5150_lib,
>  	.hcmd = &iwl5000_hcmd,
> diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
> index 1473452..f07d5e1 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-6000.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
> @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000_hcmd_utils = {
>  	.calc_rssi = iwl5000_calc_rssi,
>  };
>  
> -static struct iwl_ops iwl6000_ops = {
> +static const struct iwl_ops iwl6000_ops = {
>  	.ucode = &iwl5000_ucode,
>  	.lib = &iwl6000_lib,
>  	.hcmd = &iwl5000_hcmd,
> diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
> index 028d505..0c927e5 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-dev.h
> +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
> @@ -67,7 +67,7 @@ struct iwl_tx_queue;
>  
>  /* shared structures from iwl-5000.c */
>  extern struct iwl_mod_params iwl50_mod_params;
> -extern struct iwl_ops iwl5000_ops;
> +extern const struct iwl_ops iwl5000_ops;
>  extern struct iwl_ucode_ops iwl5000_ucode;
>  extern struct iwl_lib_ops iwl5000_lib;
>  extern struct iwl_hcmd_ops iwl5000_hcmd;
> 
>