diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-05-17 04:38:21 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-27 07:12:51 -0400 |
commit | 129219c0fd234164ebc19e8694641927317eda13 (patch) | |
tree | 0eaf5ec42db02322889b8870e01e242dd6a48cc7 /drivers | |
parent | 0d8877a10d65f3c9bb84ad150e524d95ebd377fb (diff) |
iwlwifi: dvm: constify configuration structs
The pointer that gets used is already const, so the
structs can obviously be const as well.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/agn.h | 20 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/devices.c | 18 |
2 files changed, 19 insertions, 19 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h index df64a546f52d..de2c9514bef6 100644 --- a/drivers/net/wireless/iwlwifi/dvm/agn.h +++ b/drivers/net/wireless/iwlwifi/dvm/agn.h | |||
@@ -76,16 +76,16 @@ | |||
76 | #define IWL_INVALID_STATION 255 | 76 | #define IWL_INVALID_STATION 255 |
77 | 77 | ||
78 | /* device operations */ | 78 | /* device operations */ |
79 | extern struct iwl_dvm_cfg iwl_dvm_1000_cfg; | 79 | extern const struct iwl_dvm_cfg iwl_dvm_1000_cfg; |
80 | extern struct iwl_dvm_cfg iwl_dvm_2000_cfg; | 80 | extern const struct iwl_dvm_cfg iwl_dvm_2000_cfg; |
81 | extern struct iwl_dvm_cfg iwl_dvm_105_cfg; | 81 | extern const struct iwl_dvm_cfg iwl_dvm_105_cfg; |
82 | extern struct iwl_dvm_cfg iwl_dvm_2030_cfg; | 82 | extern const struct iwl_dvm_cfg iwl_dvm_2030_cfg; |
83 | extern struct iwl_dvm_cfg iwl_dvm_5000_cfg; | 83 | extern const struct iwl_dvm_cfg iwl_dvm_5000_cfg; |
84 | extern struct iwl_dvm_cfg iwl_dvm_5150_cfg; | 84 | extern const struct iwl_dvm_cfg iwl_dvm_5150_cfg; |
85 | extern struct iwl_dvm_cfg iwl_dvm_6000_cfg; | 85 | extern const struct iwl_dvm_cfg iwl_dvm_6000_cfg; |
86 | extern struct iwl_dvm_cfg iwl_dvm_6005_cfg; | 86 | extern const struct iwl_dvm_cfg iwl_dvm_6005_cfg; |
87 | extern struct iwl_dvm_cfg iwl_dvm_6050_cfg; | 87 | extern const struct iwl_dvm_cfg iwl_dvm_6050_cfg; |
88 | extern struct iwl_dvm_cfg iwl_dvm_6030_cfg; | 88 | extern const struct iwl_dvm_cfg iwl_dvm_6030_cfg; |
89 | 89 | ||
90 | 90 | ||
91 | #define TIME_UNIT 1024 | 91 | #define TIME_UNIT 1024 |
diff --git a/drivers/net/wireless/iwlwifi/dvm/devices.c b/drivers/net/wireless/iwlwifi/dvm/devices.c index 5a1c2186ea34..352c6cb7b4f1 100644 --- a/drivers/net/wireless/iwlwifi/dvm/devices.c +++ b/drivers/net/wireless/iwlwifi/dvm/devices.c | |||
@@ -174,7 +174,7 @@ static void iwl1000_hw_set_hw_params(struct iwl_priv *priv) | |||
174 | priv->hw_params.sens = &iwl1000_sensitivity; | 174 | priv->hw_params.sens = &iwl1000_sensitivity; |
175 | } | 175 | } |
176 | 176 | ||
177 | struct iwl_dvm_cfg iwl_dvm_1000_cfg = { | 177 | const struct iwl_dvm_cfg iwl_dvm_1000_cfg = { |
178 | .set_hw_params = iwl1000_hw_set_hw_params, | 178 | .set_hw_params = iwl1000_hw_set_hw_params, |
179 | .nic_config = iwl1000_nic_config, | 179 | .nic_config = iwl1000_nic_config, |
180 | .temperature = iwlagn_temperature, | 180 | .temperature = iwlagn_temperature, |
@@ -235,7 +235,7 @@ static void iwl2000_hw_set_hw_params(struct iwl_priv *priv) | |||
235 | priv->hw_params.sens = &iwl2000_sensitivity; | 235 | priv->hw_params.sens = &iwl2000_sensitivity; |
236 | } | 236 | } |
237 | 237 | ||
238 | struct iwl_dvm_cfg iwl_dvm_2000_cfg = { | 238 | const struct iwl_dvm_cfg iwl_dvm_2000_cfg = { |
239 | .set_hw_params = iwl2000_hw_set_hw_params, | 239 | .set_hw_params = iwl2000_hw_set_hw_params, |
240 | .nic_config = iwl2000_nic_config, | 240 | .nic_config = iwl2000_nic_config, |
241 | .temperature = iwlagn_temperature, | 241 | .temperature = iwlagn_temperature, |
@@ -248,7 +248,7 @@ struct iwl_dvm_cfg iwl_dvm_2000_cfg = { | |||
248 | .temp_offset_v2 = true, | 248 | .temp_offset_v2 = true, |
249 | }; | 249 | }; |
250 | 250 | ||
251 | struct iwl_dvm_cfg iwl_dvm_105_cfg = { | 251 | const struct iwl_dvm_cfg iwl_dvm_105_cfg = { |
252 | .set_hw_params = iwl2000_hw_set_hw_params, | 252 | .set_hw_params = iwl2000_hw_set_hw_params, |
253 | .nic_config = iwl2000_nic_config, | 253 | .nic_config = iwl2000_nic_config, |
254 | .temperature = iwlagn_temperature, | 254 | .temperature = iwlagn_temperature, |
@@ -272,7 +272,7 @@ static const struct iwl_dvm_bt_params iwl2030_bt_params = { | |||
272 | .bt_session_2 = true, | 272 | .bt_session_2 = true, |
273 | }; | 273 | }; |
274 | 274 | ||
275 | struct iwl_dvm_cfg iwl_dvm_2030_cfg = { | 275 | const struct iwl_dvm_cfg iwl_dvm_2030_cfg = { |
276 | .set_hw_params = iwl2000_hw_set_hw_params, | 276 | .set_hw_params = iwl2000_hw_set_hw_params, |
277 | .nic_config = iwl2000_nic_config, | 277 | .nic_config = iwl2000_nic_config, |
278 | .temperature = iwlagn_temperature, | 278 | .temperature = iwlagn_temperature, |
@@ -463,7 +463,7 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, | |||
463 | return iwl_dvm_send_cmd(priv, &hcmd); | 463 | return iwl_dvm_send_cmd(priv, &hcmd); |
464 | } | 464 | } |
465 | 465 | ||
466 | struct iwl_dvm_cfg iwl_dvm_5000_cfg = { | 466 | const struct iwl_dvm_cfg iwl_dvm_5000_cfg = { |
467 | .set_hw_params = iwl5000_hw_set_hw_params, | 467 | .set_hw_params = iwl5000_hw_set_hw_params, |
468 | .set_channel_switch = iwl5000_hw_channel_switch, | 468 | .set_channel_switch = iwl5000_hw_channel_switch, |
469 | .temperature = iwlagn_temperature, | 469 | .temperature = iwlagn_temperature, |
@@ -472,7 +472,7 @@ struct iwl_dvm_cfg iwl_dvm_5000_cfg = { | |||
472 | .no_idle_support = true, | 472 | .no_idle_support = true, |
473 | }; | 473 | }; |
474 | 474 | ||
475 | struct iwl_dvm_cfg iwl_dvm_5150_cfg = { | 475 | const struct iwl_dvm_cfg iwl_dvm_5150_cfg = { |
476 | .set_hw_params = iwl5150_hw_set_hw_params, | 476 | .set_hw_params = iwl5150_hw_set_hw_params, |
477 | .set_channel_switch = iwl5000_hw_channel_switch, | 477 | .set_channel_switch = iwl5000_hw_channel_switch, |
478 | .temperature = iwl5150_temperature, | 478 | .temperature = iwl5150_temperature, |
@@ -634,7 +634,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, | |||
634 | return err; | 634 | return err; |
635 | } | 635 | } |
636 | 636 | ||
637 | struct iwl_dvm_cfg iwl_dvm_6000_cfg = { | 637 | const struct iwl_dvm_cfg iwl_dvm_6000_cfg = { |
638 | .set_hw_params = iwl6000_hw_set_hw_params, | 638 | .set_hw_params = iwl6000_hw_set_hw_params, |
639 | .set_channel_switch = iwl6000_hw_channel_switch, | 639 | .set_channel_switch = iwl6000_hw_channel_switch, |
640 | .nic_config = iwl6000_nic_config, | 640 | .nic_config = iwl6000_nic_config, |
@@ -657,7 +657,7 @@ const struct iwl_dvm_cfg iwl_dvm_6005_cfg = { | |||
657 | .need_temp_offset_calib = true, | 657 | .need_temp_offset_calib = true, |
658 | }; | 658 | }; |
659 | 659 | ||
660 | struct iwl_dvm_cfg iwl_dvm_6050_cfg = { | 660 | const struct iwl_dvm_cfg iwl_dvm_6050_cfg = { |
661 | .set_hw_params = iwl6000_hw_set_hw_params, | 661 | .set_hw_params = iwl6000_hw_set_hw_params, |
662 | .set_channel_switch = iwl6000_hw_channel_switch, | 662 | .set_channel_switch = iwl6000_hw_channel_switch, |
663 | .nic_config = iwl6000_nic_config, | 663 | .nic_config = iwl6000_nic_config, |
@@ -677,7 +677,7 @@ static const struct iwl_dvm_bt_params iwl6000_bt_params = { | |||
677 | .bt_sco_disable = true, | 677 | .bt_sco_disable = true, |
678 | }; | 678 | }; |
679 | 679 | ||
680 | struct iwl_dvm_cfg iwl_dvm_6030_cfg = { | 680 | const struct iwl_dvm_cfg iwl_dvm_6030_cfg = { |
681 | .set_hw_params = iwl6000_hw_set_hw_params, | 681 | .set_hw_params = iwl6000_hw_set_hw_params, |
682 | .set_channel_switch = iwl6000_hw_channel_switch, | 682 | .set_channel_switch = iwl6000_hw_channel_switch, |
683 | .nic_config = iwl6000_nic_config, | 683 | .nic_config = iwl6000_nic_config, |