diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-08-18 16:07:57 -0400 |
---|---|---|
committer | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 05:21:47 -0500 |
commit | 9406f79775a5374b932ac45ae9e84a71032a9d33 (patch) | |
tree | f832668c069682fb7d55c0b514aff97fe0e03b11 /drivers/net/wireless/iwlegacy/iwl-4965-sta.c | |
parent | 58de00a464f1e7cf0b108341dc6cc49276d19d7a (diff) |
iwlegacy: remove il argument from IWL_ERR/INFO/WARN/CRIT
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-4965-sta.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-4965-sta.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-sta.c b/drivers/net/wireless/iwlegacy/iwl-4965-sta.c index 3019bafc235..a82d44489a6 100644 --- a/drivers/net/wireless/iwlegacy/iwl-4965-sta.c +++ b/drivers/net/wireless/iwlegacy/iwl-4965-sta.c | |||
@@ -44,7 +44,7 @@ il4965_sta_alloc_lq(struct il_priv *il, u8 sta_id) | |||
44 | 44 | ||
45 | link_cmd = kzalloc(sizeof(struct il_link_quality_cmd), GFP_KERNEL); | 45 | link_cmd = kzalloc(sizeof(struct il_link_quality_cmd), GFP_KERNEL); |
46 | if (!link_cmd) { | 46 | if (!link_cmd) { |
47 | IL_ERR(il, "Unable to allocate memory for LQ cmd.\n"); | 47 | IL_ERR("Unable to allocate memory for LQ cmd.\n"); |
48 | return NULL; | 48 | return NULL; |
49 | } | 49 | } |
50 | /* Set up the rate scaling to start at selected rate, fall back | 50 | /* Set up the rate scaling to start at selected rate, fall back |
@@ -105,7 +105,7 @@ il4965_add_bssid_station(struct il_priv *il, struct il_rxon_context *ctx, | |||
105 | 105 | ||
106 | ret = il_add_station_common(il, ctx, addr, 0, NULL, &sta_id); | 106 | ret = il_add_station_common(il, ctx, addr, 0, NULL, &sta_id); |
107 | if (ret) { | 107 | if (ret) { |
108 | IL_ERR(il, "Unable to add station %pM\n", addr); | 108 | IL_ERR("Unable to add station %pM\n", addr); |
109 | return ret; | 109 | return ret; |
110 | } | 110 | } |
111 | 111 | ||
@@ -119,7 +119,7 @@ il4965_add_bssid_station(struct il_priv *il, struct il_rxon_context *ctx, | |||
119 | /* Set up default rate scaling table in device's station table */ | 119 | /* Set up default rate scaling table in device's station table */ |
120 | link_cmd = il4965_sta_alloc_lq(il, sta_id); | 120 | link_cmd = il4965_sta_alloc_lq(il, sta_id); |
121 | if (!link_cmd) { | 121 | if (!link_cmd) { |
122 | IL_ERR(il, | 122 | IL_ERR( |
123 | "Unable to initialize rate scaling for station %pM.\n", | 123 | "Unable to initialize rate scaling for station %pM.\n", |
124 | addr); | 124 | addr); |
125 | return -ENOMEM; | 125 | return -ENOMEM; |
@@ -127,7 +127,7 @@ il4965_add_bssid_station(struct il_priv *il, struct il_rxon_context *ctx, | |||
127 | 127 | ||
128 | ret = il_send_lq_cmd(il, ctx, link_cmd, CMD_SYNC, true); | 128 | ret = il_send_lq_cmd(il, ctx, link_cmd, CMD_SYNC, true); |
129 | if (ret) | 129 | if (ret) |
130 | IL_ERR(il, "Link quality command failed (%d)\n", ret); | 130 | IL_ERR("Link quality command failed (%d)\n", ret); |
131 | 131 | ||
132 | spin_lock_irqsave(&il->sta_lock, flags); | 132 | spin_lock_irqsave(&il->sta_lock, flags); |
133 | il->stations[sta_id].lq = link_cmd; | 133 | il->stations[sta_id].lq = link_cmd; |
@@ -467,7 +467,7 @@ int il4965_remove_dynamic_key(struct il_priv *il, | |||
467 | } | 467 | } |
468 | 468 | ||
469 | if (il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) { | 469 | if (il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) { |
470 | IL_WARN(il, "Removing wrong key %d 0x%x\n", | 470 | IL_WARN("Removing wrong key %d 0x%x\n", |
471 | keyconf->keyidx, key_flags); | 471 | keyconf->keyidx, key_flags); |
472 | spin_unlock_irqrestore(&il->sta_lock, flags); | 472 | spin_unlock_irqrestore(&il->sta_lock, flags); |
473 | return 0; | 473 | return 0; |
@@ -475,7 +475,7 @@ int il4965_remove_dynamic_key(struct il_priv *il, | |||
475 | 475 | ||
476 | if (!test_and_clear_bit(il->stations[sta_id].sta.key.key_offset, | 476 | if (!test_and_clear_bit(il->stations[sta_id].sta.key.key_offset, |
477 | &il->ucode_key_table)) | 477 | &il->ucode_key_table)) |
478 | IL_ERR(il, "index %d not used in uCode key table.\n", | 478 | IL_ERR("index %d not used in uCode key table.\n", |
479 | il->stations[sta_id].sta.key.key_offset); | 479 | il->stations[sta_id].sta.key.key_offset); |
480 | memset(&il->stations[sta_id].keyinfo, 0, | 480 | memset(&il->stations[sta_id].keyinfo, 0, |
481 | sizeof(struct il_hw_key)); | 481 | sizeof(struct il_hw_key)); |
@@ -525,7 +525,7 @@ int il4965_set_dynamic_key(struct il_priv *il, struct il_rxon_context *ctx, | |||
525 | keyconf, sta_id); | 525 | keyconf, sta_id); |
526 | break; | 526 | break; |
527 | default: | 527 | default: |
528 | IL_ERR(il, | 528 | IL_ERR( |
529 | "Unknown alg: %s cipher = %x\n", __func__, | 529 | "Unknown alg: %s cipher = %x\n", __func__, |
530 | keyconf->cipher); | 530 | keyconf->cipher); |
531 | ret = -EINVAL; | 531 | ret = -EINVAL; |
@@ -557,7 +557,7 @@ int il4965_alloc_bcast_station(struct il_priv *il, | |||
557 | sta_id = il_prep_station(il, ctx, il_bcast_addr, | 557 | sta_id = il_prep_station(il, ctx, il_bcast_addr, |
558 | false, NULL); | 558 | false, NULL); |
559 | if (sta_id == IL_INVALID_STATION) { | 559 | if (sta_id == IL_INVALID_STATION) { |
560 | IL_ERR(il, "Unable to prepare broadcast station\n"); | 560 | IL_ERR("Unable to prepare broadcast station\n"); |
561 | spin_unlock_irqrestore(&il->sta_lock, flags); | 561 | spin_unlock_irqrestore(&il->sta_lock, flags); |
562 | 562 | ||
563 | return -EINVAL; | 563 | return -EINVAL; |
@@ -569,7 +569,7 @@ int il4965_alloc_bcast_station(struct il_priv *il, | |||
569 | 569 | ||
570 | link_cmd = il4965_sta_alloc_lq(il, sta_id); | 570 | link_cmd = il4965_sta_alloc_lq(il, sta_id); |
571 | if (!link_cmd) { | 571 | if (!link_cmd) { |
572 | IL_ERR(il, | 572 | IL_ERR( |
573 | "Unable to initialize rate scaling for bcast station.\n"); | 573 | "Unable to initialize rate scaling for bcast station.\n"); |
574 | return -ENOMEM; | 574 | return -ENOMEM; |
575 | } | 575 | } |
@@ -596,7 +596,7 @@ static int il4965_update_bcast_station(struct il_priv *il, | |||
596 | 596 | ||
597 | link_cmd = il4965_sta_alloc_lq(il, sta_id); | 597 | link_cmd = il4965_sta_alloc_lq(il, sta_id); |
598 | if (!link_cmd) { | 598 | if (!link_cmd) { |
599 | IL_ERR(il, | 599 | IL_ERR( |
600 | "Unable to initialize rate scaling for bcast station.\n"); | 600 | "Unable to initialize rate scaling for bcast station.\n"); |
601 | return -ENOMEM; | 601 | return -ENOMEM; |
602 | } | 602 | } |
@@ -686,7 +686,7 @@ int il4965_sta_rx_agg_stop(struct il_priv *il, struct ieee80211_sta *sta, | |||
686 | 686 | ||
687 | sta_id = il_sta_id(sta); | 687 | sta_id = il_sta_id(sta); |
688 | if (sta_id == IL_INVALID_STATION) { | 688 | if (sta_id == IL_INVALID_STATION) { |
689 | IL_ERR(il, "Invalid station for AGG tid %d\n", tid); | 689 | IL_ERR("Invalid station for AGG tid %d\n", tid); |
690 | return -ENXIO; | 690 | return -ENXIO; |
691 | } | 691 | } |
692 | 692 | ||