diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 08:51:01 -0500 |
---|---|---|
committer | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 08:51:01 -0500 |
commit | 1722f8e12a9c6117d872bd19ec5919460ccdfb4e (patch) | |
tree | 8f40a7240155e074c1a8f01927821c4a16eabe70 /drivers/net/wireless/iwlegacy/3945-mac.c | |
parent | e7392364fcd1004a5e495f15cf21b1e0ef874215 (diff) |
iwlegacy: checkpatch.pl fixes
Fix most checkpatch.pl ERRORs and some WARNINGs.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945-mac.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/3945-mac.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index 2249fe44e669..daef6b58f6cc 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c | |||
@@ -1033,11 +1033,9 @@ il3945_rx_allocate(struct il_priv *il, gfp_t priority) | |||
1033 | D_INFO("Failed to allocate SKB buffer.\n"); | 1033 | D_INFO("Failed to allocate SKB buffer.\n"); |
1034 | if (rxq->free_count <= RX_LOW_WATERMARK && | 1034 | if (rxq->free_count <= RX_LOW_WATERMARK && |
1035 | net_ratelimit()) | 1035 | net_ratelimit()) |
1036 | IL_ERR | 1036 | IL_ERR("Failed to allocate SKB buffer with %0x." |
1037 | ("Failed to allocate SKB buffer with %s. Only %u free buffers remaining.\n", | 1037 | "Only %u free buffers remaining.\n", |
1038 | priority == | 1038 | priority, rxq->free_count); |
1039 | GFP_ATOMIC ? "GFP_ATOMIC" : "GFP_KERNEL", | ||
1040 | rxq->free_count); | ||
1041 | /* We don't reschedule replenish work here -- we will | 1039 | /* We don't reschedule replenish work here -- we will |
1042 | * call the restock method and if it still needs | 1040 | * call the restock method and if it still needs |
1043 | * more buffers it will schedule replenish */ | 1041 | * more buffers it will schedule replenish */ |
@@ -3250,7 +3248,7 @@ il3945_show_measurement(struct device *d, struct device_attribute *attr, | |||
3250 | struct il_priv *il = dev_get_drvdata(d); | 3248 | struct il_priv *il = dev_get_drvdata(d); |
3251 | struct il_spectrum_notification measure_report; | 3249 | struct il_spectrum_notification measure_report; |
3252 | u32 size = sizeof(measure_report), len = 0, ofs = 0; | 3250 | u32 size = sizeof(measure_report), len = 0, ofs = 0; |
3253 | u8 *data = (u8 *) & measure_report; | 3251 | u8 *data = (u8 *) &measure_report; |
3254 | unsigned long flags; | 3252 | unsigned long flags; |
3255 | 3253 | ||
3256 | spin_lock_irqsave(&il->lock, flags); | 3254 | spin_lock_irqsave(&il->lock, flags); |