* [PATCH 00/39] Cleanup WARN #defines
@ 2010-10-30 21:08 Joe Perches
2010-10-30 21:08 ` [PATCH 18/39] drivers/net/wireless/iwlwifi: Update WARN uses Joe Perches
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Joe Perches @ 2010-10-30 21:08 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-alpha, linux-kernel, linux-arm-kernel, linux-omap,
linux-tegra, linuxppc-dev, linux-pm, discuss, linux-acpi,
linux1394-devel, dri-devel, intel-gfx, linux-media,
socketcan-core, netdev, linux-usb, linux-wireless, devel,
linux-scsi, devel, linux-fbdev, linux-fsdevel, linux-nfs,
linux-arch, linux-mm, alsa-devel
WARN uses sometimes use KERN_<level> but mostly don't
have any prefix.
Change the WARN macros and the warn_slowpath function to preface
KERN_WARNING and remove all the KERN_<level> uses from WARN sites.
Neatening clean up of include/asm-generic/bug.h
Update WARN macros
Add KERN_WARNING to WARN output
Remove any KERN_<level> from WARN uses
Coalesce formats
Align WARN arguments
Add some missing newlines to WARN uses
Add some missing first test argument (1, fmt, args) to WARN uses
Joe Perches (39):
include/asm-generic/bug.h: Update WARN macros
arch/alpha: Update WARN uses
arch/arm: Update WARN uses
arch/powerpc: Update WARN uses
arch/x86: Update WARN uses
drivers/acpi: Update WARN uses
drivers/base: Update WARN uses
drivers/block: Update WARN uses
drivers/cpuidle: Update WARN uses
drivers/firewire: Update WARN uses
drivers/firmware: Update WARN uses
drivers/gpio: Update WARN uses
drivers/gpu/drm: Update WARN uses
drivers/media/video: Update WARN uses
drivers/mfd: Update WARN uses
drivers/net/can: Update WARN uses
drivers/net/usb: Update WARN uses
drivers/net/wireless/iwlwifi: Update WARN uses
drivers/regulator: Update WARN uses
drivers/scsi/fcoe: Update WARN uses
drivers/staging: Update WARN uses
drivers/usb/musb: Update WARN uses
drivers/video/omap2/dss: Update WARN uses
fs/nfsd: Update WARN uses
fs/notify/inotify: Update WARN uses
fs/sysfs: Update WARN uses
fs/proc: Update WARN uses
fs: Update WARN uses
include/linux/device.h: Update WARN uses
kernel/irq: Update WARN uses
kernel/panic.c: Update warn_slowpath to use %pV
kernel: Update WARN uses
lib: Update WARN uses
mm: Update WARN uses
net/core/dev.c: Update WARN uses
net/ipv4/tcp.c: Update WARN uses
net/mac80211: Update WARN uses
net/rfkill/input.c: Update WARN uses
sound/soc/codecs/wm_hubs.c: Update WARN uses
arch/alpha/kernel/pci-sysfs.c | 14 ++--
arch/arm/mach-davinci/clock.c | 4 +-
arch/arm/mach-davinci/da830.c | 2 +-
arch/arm/mach-davinci/da850.c | 12 ++--
arch/arm/mach-omap2/clkt_clksel.c | 12 ++--
arch/arm/mach-omap2/clock.c | 16 ++--
arch/arm/mach-omap2/devices.c | 4 +-
arch/arm/mach-omap2/omap_hwmod.c | 47 +++++++-----
arch/arm/mach-omap2/pm34xx.c | 7 +-
arch/arm/mach-omap2/serial.c | 2 +-
arch/arm/mach-omap2/timer-gp.c | 3 +-
arch/arm/mach-tegra/clock.c | 3 +-
arch/arm/mach-tegra/timer.c | 2 +-
arch/arm/mach-u300/padmux.c | 14 +---
arch/arm/plat-omap/omap-pm-noop.c | 10 ++--
arch/powerpc/kernel/hw_breakpoint.c | 4 +-
arch/x86/kernel/acpi/boot.c | 2 +-
arch/x86/kernel/apic/apic.c | 2 +-
arch/x86/kernel/apic/es7000_32.c | 2 +-
arch/x86/kernel/cpu/perf_event.c | 4 +-
arch/x86/kernel/pci-calgary_64.c | 4 +-
arch/x86/kernel/tsc_sync.c | 4 +-
arch/x86/kernel/xsave.c | 2 +-
arch/x86/mm/ioremap.c | 5 +-
arch/x86/mm/pageattr-test.c | 2 +-
arch/x86/mm/pageattr.c | 5 +-
arch/x86/platform/sfi/sfi.c | 4 +-
drivers/acpi/ec.c | 4 +-
drivers/base/class.c | 4 +-
drivers/base/core.c | 5 +-
drivers/base/memory.c | 4 +-
drivers/base/sys.c | 10 +--
drivers/block/floppy.c | 2 +-
drivers/cpuidle/driver.c | 2 +-
drivers/firewire/core-transaction.c | 6 +-
drivers/firmware/dmi_scan.c | 2 +-
drivers/gpio/gpiolib.c | 4 +-
drivers/gpio/it8761e_gpio.c | 2 +-
drivers/gpu/drm/drm_crtc_helper.c | 2 +-
drivers/gpu/drm/i915/i915_gem.c | 3 +-
drivers/gpu/drm/radeon/evergreen.c | 2 +-
drivers/gpu/drm/radeon/r100.c | 4 +-
drivers/gpu/drm/radeon/r300.c | 2 +-
drivers/gpu/drm/radeon/r600.c | 4 +-
drivers/gpu/drm/radeon/radeon_fence.c | 3 +-
drivers/gpu/drm/radeon/radeon_ttm.c | 3 +-
drivers/gpu/drm/radeon/rs400.c | 2 +-
drivers/gpu/drm/radeon/rs600.c | 4 +-
drivers/media/video/s5p-fimc/fimc-core.c | 2 +-
drivers/media/video/sr030pc30.c | 2 +-
drivers/mfd/ezx-pcap.c | 5 +-
drivers/net/can/mscan/mscan.c | 2 +-
drivers/net/usb/ipheth.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 3 +-
drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 6 +-
drivers/net/wireless/iwlwifi/iwl-tx.c | 6 +-
drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +-
drivers/regulator/core.c | 3 +-
drivers/scsi/fcoe/libfcoe.c | 2 +-
drivers/staging/memrar/memrar_allocator.c | 2 +-
drivers/staging/solo6x10/solo6010-v4l2-enc.c | 2 +-
drivers/usb/musb/musb_host.c | 6 +-
drivers/video/omap2/dss/core.c | 3 +-
fs/bio.c | 2 +-
fs/buffer.c | 2 +-
fs/nfsd/nfs4state.c | 3 +-
fs/notify/inotify/inotify_fsnotify.c | 4 +-
fs/proc/generic.c | 9 +--
fs/super.c | 5 +-
fs/sysfs/dir.c | 3 +-
fs/sysfs/file.c | 4 +-
fs/sysfs/group.c | 4 +-
fs/sysfs/symlink.c | 10 +--
include/asm-generic/bug.h | 101 ++++++++++++++++----------
include/linux/device.h | 2 +-
kernel/irq/chip.c | 2 +-
kernel/irq/manage.c | 2 +-
kernel/notifier.c | 2 +-
kernel/panic.c | 40 +++++------
kernel/pm_qos_params.c | 6 +-
lib/debugobjects.c | 21 +++---
lib/iomap.c | 2 +-
lib/kobject.c | 9 +--
lib/kobject_uevent.c | 4 +-
lib/list_debug.c | 24 +++----
lib/plist.c | 12 ++--
mm/percpu.c | 4 +-
mm/vmalloc.c | 5 +-
net/core/dev.c | 3 +-
net/ipv4/tcp.c | 16 ++---
net/mac80211/agg-tx.c | 5 +-
net/mac80211/iface.c | 4 +-
net/mac80211/mlme.c | 2 +-
net/mac80211/rx.c | 4 +-
net/mac80211/tx.c | 4 +-
net/mac80211/util.c | 4 +-
net/mac80211/work.c | 4 +-
net/rfkill/input.c | 5 +-
sound/soc/codecs/wm_hubs.c | 2 +-
99 files changed, 319 insertions(+), 330 deletions(-)
--
1.7.3.1.g432b3.dirty
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 18/39] drivers/net/wireless/iwlwifi: Update WARN uses 2010-10-30 21:08 [PATCH 00/39] Cleanup WARN #defines Joe Perches @ 2010-10-30 21:08 ` Joe Perches 2010-10-30 21:08 ` [PATCH 37/39] net/mac80211: " Joe Perches 2010-10-30 21:08 ` [PATCH 38/39] net/rfkill/input.c: " Joe Perches 2 siblings, 0 replies; 5+ messages in thread From: Joe Perches @ 2010-10-30 21:08 UTC (permalink / raw) To: Jiri Kosina Cc: Reinette Chatre, Wey-Yi Guy, Intel Linux Wireless, John W. Linville, linux-wireless, netdev, linux-kernel Align arguments. Add missing newlines. Signed-off-by: Joe Perches <joe@perches.com> --- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 3 +-- drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 6 +++--- drivers/net/wireless/iwlwifi/iwl-tx.c | 6 +++--- drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index b555edd..cbb63f3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c @@ -2139,8 +2139,7 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt) case IEEE80211_SMPS_OFF: return active_cnt; default: - WARN(1, "invalid SMPS mode %d", - priv->current_ht_config.smps); + WARN(1, "invalid SMPS mode %d\n", priv->current_ht_config.smps); return active_cnt; } } diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c index 35a30d2..46c45e7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c @@ -284,7 +284,7 @@ static int iwl_set_wep_dynamic_key_info(struct iwl_priv *priv, * in uCode. */ WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, - "no space for a new key"); + "no space for a new key\n"); priv->stations[sta_id].sta.key.key_flags = key_flags; priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; @@ -334,7 +334,7 @@ static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv, * in uCode. */ WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, - "no space for a new key"); + "no space for a new key\n"); priv->stations[sta_id].sta.key.key_flags = key_flags; priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; @@ -378,7 +378,7 @@ static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv, * in uCode. */ WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, - "no space for a new key"); + "no space for a new key\n"); priv->stations[sta_id].sta.key.key_flags = key_flags; diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 7261ee4..1d8c4a6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -594,9 +594,9 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) * in the queue management code. */ if (WARN(txq_id != priv->cmd_queue, "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d\n", - txq_id, priv->cmd_queue, sequence, - priv->txq[priv->cmd_queue].q.read_ptr, - priv->txq[priv->cmd_queue].q.write_ptr)) { + txq_id, priv->cmd_queue, sequence, + priv->txq[priv->cmd_queue].q.read_ptr, + priv->txq[priv->cmd_queue].q.write_ptr)) { iwl_print_hex_error(priv, pkt, 32); return; } diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 8f8c4b7..c89c409 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -168,7 +168,7 @@ static int iwl3945_set_ccmp_dynamic_key_info(struct iwl_priv *priv, * in uCode. */ WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, - "no space for a new key"); + "no space for a new key\n"); priv->stations[sta_id].sta.key.key_flags = key_flags; priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; -- 1.7.3.1.g432b3.dirty ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 37/39] net/mac80211: Update WARN uses 2010-10-30 21:08 [PATCH 00/39] Cleanup WARN #defines Joe Perches 2010-10-30 21:08 ` [PATCH 18/39] drivers/net/wireless/iwlwifi: Update WARN uses Joe Perches @ 2010-10-30 21:08 ` Joe Perches 2010-10-31 7:33 ` Johannes Berg 2010-10-30 21:08 ` [PATCH 38/39] net/rfkill/input.c: " Joe Perches 2 siblings, 1 reply; 5+ messages in thread From: Joe Perches @ 2010-10-30 21:08 UTC (permalink / raw) To: Jiri Kosina Cc: John W. Linville, Johannes Berg, David S. Miller, linux-wireless, netdev, linux-kernel Coalesce long formats. Add missing newlines. Signed-off-by: Joe Perches <joe@perches.com> --- net/mac80211/agg-tx.c | 5 +++-- net/mac80211/iface.c | 4 ++-- net/mac80211/mlme.c | 2 +- net/mac80211/rx.c | 4 +--- net/mac80211/tx.c | 4 +--- net/mac80211/util.c | 4 +--- net/mac80211/work.c | 4 ++-- 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index d4679b2..9f2c3f6 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -454,8 +454,9 @@ ieee80211_agg_splice_packets(struct ieee80211_local *local, ieee80211_stop_queue_agg(local, tid); - if (WARN(!tid_tx, "TID %d gone but expected when splicing aggregates" - " from the pending queue\n", tid)) + if (WARN(!tid_tx, + "TID %d gone but expected when splicing aggregates from the pending queue\n", + tid)) return; if (!skb_queue_empty(&tid_tx->pending)) { diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index f9163b1..328e637 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -820,7 +820,7 @@ static void ieee80211_iface_work(struct work_struct *work) ieee80211_mesh_rx_queued_mgmt(sdata, skb); break; default: - WARN(1, "frame for unexpected interface type"); + WARN(1, "frame for unexpected interface type\n"); break; } @@ -979,7 +979,7 @@ static int ieee80211_runtime_change_iftype(struct ieee80211_sub_if_data *sdata, ieee80211_setup_sdata(sdata, type); err = ieee80211_do_open(sdata->dev, false); - WARN(err, "type change: do_open returned %d", err); + WARN(err, "type change: do_open returned %d\n", err); return ret; } diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index a3a9421..22f054a 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1780,7 +1780,7 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, cfg80211_send_disassoc(sdata->dev, (u8 *)mgmt, skb->len); break; default: - WARN(1, "unexpected: %d", rma); + WARN(1, "unexpected: %d\n", rma); } return; } diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 902b03e..7775375 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2840,9 +2840,7 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb) */ if (WARN((status->rate_idx < 0 || status->rate_idx > 76), - "Rate marked as an HT rate but passed " - "status->rate_idx is not " - "an MCS index [0-76]: %d (0x%02x)\n", + "Rate marked as an HT rate but passed status->rate_idx is not an MCS index [0-76]: %d (0x%02x)\n", status->rate_idx, status->rate_idx)) goto drop; diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 96c5943..a511d69 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -649,9 +649,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx) if (WARN(test_bit(SCAN_SW_SCANNING, &tx->local->scanning) && (sta_flags & WLAN_STA_ASSOC) && !rate_usable_index_exists(sband, &tx->sta->sta), - "%s: Dropped data frame as no usable bitrate found while " - "scanning and associated. Target station: " - "%pM on %d GHz band\n", + "%s: Dropped data frame as no usable bitrate found while scanning and associated. Target station: %pM on %d GHz band\n", tx->sdata->name, hdr->addr1, tx->channel->band ? 5 : 2)) return TX_DROP; diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 0b6fc92..2a14723 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1120,9 +1120,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) */ res = drv_start(local); if (res) { - WARN(local->suspended, "Hardware became unavailable " - "upon resume. This could be a software issue " - "prior to suspend or a hardware issue.\n"); + WARN(local->suspended, "Hardware became unavailable upon resume. This could be a software issue prior to suspend or a hardware issue.\n"); return res; } diff --git a/net/mac80211/work.c b/net/mac80211/work.c index ae344d1..8583206 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c @@ -830,7 +830,7 @@ static void ieee80211_work_rx_queued_mgmt(struct ieee80211_local *local, list_del_rcu(&wk->list); break; default: - WARN(1, "unexpected: %d", rma); + WARN(1, "unexpected: %d\n", rma); } mutex_unlock(&local->mtx); @@ -973,7 +973,7 @@ static void ieee80211_work_work(struct work_struct *work) list_add(&wk->list, &free_work); break; default: - WARN(1, "unexpected: %d", rma); + WARN(1, "unexpected: %d\n", rma); } } -- 1.7.3.1.g432b3.dirty ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 37/39] net/mac80211: Update WARN uses 2010-10-30 21:08 ` [PATCH 37/39] net/mac80211: " Joe Perches @ 2010-10-31 7:33 ` Johannes Berg 0 siblings, 0 replies; 5+ messages in thread From: Johannes Berg @ 2010-10-31 7:33 UTC (permalink / raw) To: Joe Perches Cc: Jiri Kosina, John W. Linville, David S. Miller, linux-wireless, netdev, linux-kernel On Sat, 2010-10-30 at 14:08 -0700, Joe Perches wrote: > Coalesce long formats. > Add missing newlines. > - WARN(1, "frame for unexpected interface type"); > + WARN(1, "frame for unexpected interface type\n"); But I thought WARN() added a newline... johannes ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 38/39] net/rfkill/input.c: Update WARN uses 2010-10-30 21:08 [PATCH 00/39] Cleanup WARN #defines Joe Perches 2010-10-30 21:08 ` [PATCH 18/39] drivers/net/wireless/iwlwifi: Update WARN uses Joe Perches 2010-10-30 21:08 ` [PATCH 37/39] net/mac80211: " Joe Perches @ 2010-10-30 21:08 ` Joe Perches 2 siblings, 0 replies; 5+ messages in thread From: Joe Perches @ 2010-10-30 21:08 UTC (permalink / raw) To: Jiri Kosina Cc: Johannes Berg, John W. Linville, David S. Miller, linux-wireless, netdev, linux-kernel Coalesce long formats. Align arguments. Signed-off-by: Joe Perches <joe@perches.com> --- net/rfkill/input.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/net/rfkill/input.c b/net/rfkill/input.c index 1bca6d4..4343f59 100644 --- a/net/rfkill/input.c +++ b/net/rfkill/input.c @@ -75,9 +75,8 @@ static void __rfkill_handle_global_op(enum rfkill_sched_op op) default: /* memory corruption or bug, fail safely */ rfkill_epo(); - WARN(1, "Unknown requested operation %d! " - "rfkill Emergency Power Off activated\n", - op); + WARN(1, "Unknown requested operation %d! rfkill Emergency Power Off activated\n", + op); } } -- 1.7.3.1.g432b3.dirty ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-10-31 7:33 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-10-30 21:08 [PATCH 00/39] Cleanup WARN #defines Joe Perches 2010-10-30 21:08 ` [PATCH 18/39] drivers/net/wireless/iwlwifi: Update WARN uses Joe Perches 2010-10-30 21:08 ` [PATCH 37/39] net/mac80211: " Joe Perches 2010-10-31 7:33 ` Johannes Berg 2010-10-30 21:08 ` [PATCH 38/39] net/rfkill/input.c: " Joe Perches
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).