* [PATCH 2/4] rt2x00: remove NOTICE
2013-01-24 20:59 [PATCH 1/4] rt2x00: print warning, notice and info as default Stanislaw Gruszka
@ 2013-01-24 21:00 ` Stanislaw Gruszka
2013-01-24 21:01 ` [PATCH 3/4] rt2800usb: move "TX status missed" messages to debug level Stanislaw Gruszka
` (3 more replies)
2013-01-24 21:06 ` [PATCH 1/4] rt2x00: print warning, notice and info as default Gertjan van Wingerde
2013-02-02 23:50 ` Xose Vazquez Perez
2 siblings, 4 replies; 19+ messages in thread
From: Stanislaw Gruszka @ 2013-01-24 21:00 UTC (permalink / raw)
To: John W. Linville; +Cc: Xose Vazquez Perez, linux-wireless, users
We use this macro only on 3 places - remove it and replace by other
appropriate macros for printing messages.
Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
---
drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
drivers/net/wireless/rt2x00/rt2x00.h | 2 --
drivers/net/wireless/rt2x00/rt2x00dev.c | 4 ++--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index a1de95e..1791260 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -80,7 +80,7 @@ static inline bool rt2800_is_305x_soc(struct rt2x00_dev *rt2x00dev)
rt2x00_rf(rt2x00dev, RF3022))
return true;
- NOTICE(rt2x00dev, "Unknown RF chipset on rt305x\n");
+ INFO(rt2x00dev, "Unknown RF chipset on rt305x\n");
return false;
}
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 8ef11b6..ad73942 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -89,8 +89,6 @@
DEBUG_PRINTK_PROBE(KERN_ERR, "Error", __msg, ##__args)
#define WARNING(__dev, __msg, __args...) \
DEBUG_PRINTK_MSG(__dev, KERN_WARNING, "Warning", __msg, ##__args)
-#define NOTICE(__dev, __msg, __args...) \
- DEBUG_PRINTK_MSG(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
#define INFO(__dev, __msg, __args...) \
DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
#define DEBUG(__dev, __msg, __args...) \
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 96fffe8..07a9e10 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1440,7 +1440,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_remove_dev);
#ifdef CONFIG_PM
int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
{
- NOTICE(rt2x00dev, "Going to sleep.\n");
+ DEBUG(rt2x00dev, "Going to sleep.\n");
/*
* Prevent mac80211 from accessing driver while suspended.
@@ -1480,7 +1480,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_suspend);
int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
{
- NOTICE(rt2x00dev, "Waking up.\n");
+ DEBUG(rt2x00dev, "Waking up.\n");
/*
* Restore/enable extra components.
--
1.7.4.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 3/4] rt2800usb: move "TX status missed" messages to debug level
2013-01-24 21:00 ` [PATCH 2/4] rt2x00: remove NOTICE Stanislaw Gruszka
@ 2013-01-24 21:01 ` Stanislaw Gruszka
2013-01-24 21:01 ` [PATCH 4/4] rt2x00: print queue parameters at " Stanislaw Gruszka
` (2 more replies)
2013-01-24 21:06 ` [PATCH 2/4] rt2x00: remove NOTICE Gertjan van Wingerde
` (2 subsequent siblings)
3 siblings, 3 replies; 19+ messages in thread
From: Stanislaw Gruszka @ 2013-01-24 21:01 UTC (permalink / raw)
To: John W. Linville; +Cc: Xose Vazquez Perez, linux-wireless, users
Those messages can flood in dmesg, so do not print them by default.
Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
---
drivers/net/wireless/rt2x00/rt2800usb.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 011410f..047ead5 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -540,9 +540,9 @@ rt2800usb_txdone_entry_check(struct queue_entry *entry, u32 reg)
tx_pid = rt2x00_get_field32(word, TXWI_W1_PACKETID);
if (wcid != tx_wcid || ack != tx_ack || (!is_agg && pid != tx_pid)) {
- WARNING(entry->queue->rt2x00dev,
- "TX status report missed for queue %d entry %d\n",
- entry->queue->qid, entry->entry_idx);
+ DEBUG(entry->queue->rt2x00dev,
+ "TX status report missed for queue %d entry %d\n",
+ entry->queue->qid, entry->entry_idx);
return TXDONE_UNKNOWN;
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 4/4] rt2x00: print queue parameters at debug level
2013-01-24 21:01 ` [PATCH 3/4] rt2800usb: move "TX status missed" messages to debug level Stanislaw Gruszka
@ 2013-01-24 21:01 ` Stanislaw Gruszka
2013-01-24 21:07 ` Gertjan van Wingerde
2013-01-26 17:16 ` Ivo Van Doorn
2013-01-24 21:07 ` [PATCH 3/4] rt2800usb: move "TX status missed" messages to " Gertjan van Wingerde
2013-01-26 17:15 ` Ivo Van Doorn
2 siblings, 2 replies; 19+ messages in thread
From: Stanislaw Gruszka @ 2013-01-24 21:01 UTC (permalink / raw)
To: John W. Linville; +Cc: Xose Vazquez Perez, linux-wireless, users
Those messages do not provide interesting information for average user,
print them at debug level.
Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
---
drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index ed7a1bb..20c6ecc 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -731,9 +731,9 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw,
queue->aifs = params->aifs;
queue->txop = params->txop;
- INFO(rt2x00dev,
- "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",
- queue_idx, queue->cw_min, queue->cw_max, queue->aifs, queue->txop);
+ DEBUG(rt2x00dev,
+ "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",
+ queue_idx, queue->cw_min, queue->cw_max, queue->aifs, queue->txop);
return 0;
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 4/4] rt2x00: print queue parameters at debug level
2013-01-24 21:01 ` [PATCH 4/4] rt2x00: print queue parameters at " Stanislaw Gruszka
@ 2013-01-24 21:07 ` Gertjan van Wingerde
2013-01-26 17:16 ` Ivo Van Doorn
1 sibling, 0 replies; 19+ messages in thread
From: Gertjan van Wingerde @ 2013-01-24 21:07 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: John W. Linville, Xose Vazquez Perez,
linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
Sent from my iPad
On 24 jan. 2013, at 22:01, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
> Those messages do not provide interesting information for average user,
> print them at debug level.
>
> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
> ---
> drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
> index ed7a1bb..20c6ecc 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00mac.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
> @@ -731,9 +731,9 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw,
> queue->aifs = params->aifs;
> queue->txop = params->txop;
>
> - INFO(rt2x00dev,
> - "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",
> - queue_idx, queue->cw_min, queue->cw_max, queue->aifs, queue->txop);
> + DEBUG(rt2x00dev,
> + "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",
> + queue_idx, queue->cw_min, queue->cw_max, queue->aifs, queue->txop);
>
> return 0;
> }
> --
> 1.7.4.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 4/4] rt2x00: print queue parameters at debug level
2013-01-24 21:01 ` [PATCH 4/4] rt2x00: print queue parameters at " Stanislaw Gruszka
2013-01-24 21:07 ` Gertjan van Wingerde
@ 2013-01-26 17:16 ` Ivo Van Doorn
1 sibling, 0 replies; 19+ messages in thread
From: Ivo Van Doorn @ 2013-01-26 17:16 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: John W. Linville, Xose Vazquez Perez, linux-wireless,
rt2x00 Users List
On Thu, Jan 24, 2013 at 10:01 PM, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
> Those messages do not provide interesting information for average user,
> print them at debug level.
>
> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
> ---
> drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
> index ed7a1bb..20c6ecc 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00mac.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
> @@ -731,9 +731,9 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw,
> queue->aifs = params->aifs;
> queue->txop = params->txop;
>
> - INFO(rt2x00dev,
> - "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",
> - queue_idx, queue->cw_min, queue->cw_max, queue->aifs, queue->txop);
> + DEBUG(rt2x00dev,
> + "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",
> + queue_idx, queue->cw_min, queue->cw_max, queue->aifs, queue->txop);
>
> return 0;
> }
> --
> 1.7.4.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/4] rt2800usb: move "TX status missed" messages to debug level
2013-01-24 21:01 ` [PATCH 3/4] rt2800usb: move "TX status missed" messages to debug level Stanislaw Gruszka
2013-01-24 21:01 ` [PATCH 4/4] rt2x00: print queue parameters at " Stanislaw Gruszka
@ 2013-01-24 21:07 ` Gertjan van Wingerde
2013-01-26 17:15 ` Ivo Van Doorn
2 siblings, 0 replies; 19+ messages in thread
From: Gertjan van Wingerde @ 2013-01-24 21:07 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: John W. Linville, Xose Vazquez Perez,
linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
Sent from my iPad
On 24 jan. 2013, at 22:01, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
> Those messages can flood in dmesg, so do not print them by default.
>
> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
> ---
> drivers/net/wireless/rt2x00/rt2800usb.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
> index 011410f..047ead5 100644
> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
> @@ -540,9 +540,9 @@ rt2800usb_txdone_entry_check(struct queue_entry *entry, u32 reg)
> tx_pid = rt2x00_get_field32(word, TXWI_W1_PACKETID);
>
> if (wcid != tx_wcid || ack != tx_ack || (!is_agg && pid != tx_pid)) {
> - WARNING(entry->queue->rt2x00dev,
> - "TX status report missed for queue %d entry %d\n",
> - entry->queue->qid, entry->entry_idx);
> + DEBUG(entry->queue->rt2x00dev,
> + "TX status report missed for queue %d entry %d\n",
> + entry->queue->qid, entry->entry_idx);
> return TXDONE_UNKNOWN;
> }
>
> --
> 1.7.4.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 3/4] rt2800usb: move "TX status missed" messages to debug level
2013-01-24 21:01 ` [PATCH 3/4] rt2800usb: move "TX status missed" messages to debug level Stanislaw Gruszka
2013-01-24 21:01 ` [PATCH 4/4] rt2x00: print queue parameters at " Stanislaw Gruszka
2013-01-24 21:07 ` [PATCH 3/4] rt2800usb: move "TX status missed" messages to " Gertjan van Wingerde
@ 2013-01-26 17:15 ` Ivo Van Doorn
2 siblings, 0 replies; 19+ messages in thread
From: Ivo Van Doorn @ 2013-01-26 17:15 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: John W. Linville, Xose Vazquez Perez, linux-wireless,
rt2x00 Users List
On Thu, Jan 24, 2013 at 10:01 PM, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
> Those messages can flood in dmesg, so do not print them by default.
>
> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
> ---
> drivers/net/wireless/rt2x00/rt2800usb.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
> index 011410f..047ead5 100644
> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
> @@ -540,9 +540,9 @@ rt2800usb_txdone_entry_check(struct queue_entry *entry, u32 reg)
> tx_pid = rt2x00_get_field32(word, TXWI_W1_PACKETID);
>
> if (wcid != tx_wcid || ack != tx_ack || (!is_agg && pid != tx_pid)) {
> - WARNING(entry->queue->rt2x00dev,
> - "TX status report missed for queue %d entry %d\n",
> - entry->queue->qid, entry->entry_idx);
> + DEBUG(entry->queue->rt2x00dev,
> + "TX status report missed for queue %d entry %d\n",
> + entry->queue->qid, entry->entry_idx);
> return TXDONE_UNKNOWN;
> }
>
> --
> 1.7.4.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/4] rt2x00: remove NOTICE
2013-01-24 21:00 ` [PATCH 2/4] rt2x00: remove NOTICE Stanislaw Gruszka
2013-01-24 21:01 ` [PATCH 3/4] rt2800usb: move "TX status missed" messages to debug level Stanislaw Gruszka
@ 2013-01-24 21:06 ` Gertjan van Wingerde
2013-01-25 12:28 ` Ivo Van Doorn
2013-01-26 17:13 ` [PATCH 2/4 v2] " Stanislaw Gruszka
3 siblings, 0 replies; 19+ messages in thread
From: Gertjan van Wingerde @ 2013-01-24 21:06 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: John W. Linville, Xose Vazquez Perez,
linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
Sent from my iPad
On 24 jan. 2013, at 22:00, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
> We use this macro only on 3 places - remove it and replace by other
> appropriate macros for printing messages.
>
> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
> ---
> drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
> drivers/net/wireless/rt2x00/rt2x00.h | 2 --
> drivers/net/wireless/rt2x00/rt2x00dev.c | 4 ++--
> 3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index a1de95e..1791260 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -80,7 +80,7 @@ static inline bool rt2800_is_305x_soc(struct rt2x00_dev *rt2x00dev)
> rt2x00_rf(rt2x00dev, RF3022))
> return true;
>
> - NOTICE(rt2x00dev, "Unknown RF chipset on rt305x\n");
> + INFO(rt2x00dev, "Unknown RF chipset on rt305x\n");
> return false;
> }
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 8ef11b6..ad73942 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -89,8 +89,6 @@
> DEBUG_PRINTK_PROBE(KERN_ERR, "Error", __msg, ##__args)
> #define WARNING(__dev, __msg, __args...) \
> DEBUG_PRINTK_MSG(__dev, KERN_WARNING, "Warning", __msg, ##__args)
> -#define NOTICE(__dev, __msg, __args...) \
> - DEBUG_PRINTK_MSG(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
> #define INFO(__dev, __msg, __args...) \
> DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
> #define DEBUG(__dev, __msg, __args...) \
> diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
> index 96fffe8..07a9e10 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
> @@ -1440,7 +1440,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_remove_dev);
> #ifdef CONFIG_PM
> int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
> {
> - NOTICE(rt2x00dev, "Going to sleep.\n");
> + DEBUG(rt2x00dev, "Going to sleep.\n");
>
> /*
> * Prevent mac80211 from accessing driver while suspended.
> @@ -1480,7 +1480,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_suspend);
>
> int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
> {
> - NOTICE(rt2x00dev, "Waking up.\n");
> + DEBUG(rt2x00dev, "Waking up.\n");
>
> /*
> * Restore/enable extra components.
> --
> 1.7.4.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 2/4] rt2x00: remove NOTICE
2013-01-24 21:00 ` [PATCH 2/4] rt2x00: remove NOTICE Stanislaw Gruszka
2013-01-24 21:01 ` [PATCH 3/4] rt2800usb: move "TX status missed" messages to debug level Stanislaw Gruszka
2013-01-24 21:06 ` [PATCH 2/4] rt2x00: remove NOTICE Gertjan van Wingerde
@ 2013-01-25 12:28 ` Ivo Van Doorn
2013-01-26 17:09 ` Stanislaw Gruszka
2013-01-26 17:13 ` [PATCH 2/4 v2] " Stanislaw Gruszka
3 siblings, 1 reply; 19+ messages in thread
From: Ivo Van Doorn @ 2013-01-25 12:28 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: John W. Linville, Xose Vazquez Perez, linux-wireless,
rt2x00 Users List
On Thu, Jan 24, 2013 at 10:00 PM, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
> We use this macro only on 3 places - remove it and replace by other
> appropriate macros for printing messages.
>
> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
> ---
> drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
> drivers/net/wireless/rt2x00/rt2x00.h | 2 --
> drivers/net/wireless/rt2x00/rt2x00dev.c | 4 ++--
> 3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index a1de95e..1791260 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -80,7 +80,7 @@ static inline bool rt2800_is_305x_soc(struct rt2x00_dev *rt2x00dev)
> rt2x00_rf(rt2x00dev, RF3022))
> return true;
>
> - NOTICE(rt2x00dev, "Unknown RF chipset on rt305x\n");
> + INFO(rt2x00dev, "Unknown RF chipset on rt305x\n");
> return false;
> }
Isn't this more a warning?
Ivo
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/4] rt2x00: remove NOTICE
2013-01-25 12:28 ` Ivo Van Doorn
@ 2013-01-26 17:09 ` Stanislaw Gruszka
0 siblings, 0 replies; 19+ messages in thread
From: Stanislaw Gruszka @ 2013-01-26 17:09 UTC (permalink / raw)
To: Ivo Van Doorn
Cc: John W. Linville, Xose Vazquez Perez, linux-wireless,
rt2x00 Users List
On Fri, Jan 25, 2013 at 01:28:44PM +0100, Ivo Van Doorn wrote:
> On Thu, Jan 24, 2013 at 10:00 PM, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
> > We use this macro only on 3 places - remove it and replace by other
> > appropriate macros for printing messages.
> >
> > Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
> > ---
> > drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
> > drivers/net/wireless/rt2x00/rt2x00.h | 2 --
> > drivers/net/wireless/rt2x00/rt2x00dev.c | 4 ++--
> > 3 files changed, 3 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> > index a1de95e..1791260 100644
> > --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> > +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> > @@ -80,7 +80,7 @@ static inline bool rt2800_is_305x_soc(struct rt2x00_dev *rt2x00dev)
> > rt2x00_rf(rt2x00dev, RF3022))
> > return true;
> >
> > - NOTICE(rt2x00dev, "Unknown RF chipset on rt305x\n");
> > + INFO(rt2x00dev, "Unknown RF chipset on rt305x\n");
> > return false;
> > }
>
> Isn't this more a warning?
Yeah, I'll change that patch.
Stanislaw
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/4 v2] rt2x00: remove NOTICE
2013-01-24 21:00 ` [PATCH 2/4] rt2x00: remove NOTICE Stanislaw Gruszka
` (2 preceding siblings ...)
2013-01-25 12:28 ` Ivo Van Doorn
@ 2013-01-26 17:13 ` Stanislaw Gruszka
2013-01-26 17:14 ` Ivo Van Doorn
3 siblings, 1 reply; 19+ messages in thread
From: Stanislaw Gruszka @ 2013-01-26 17:13 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, Xose Vazquez Perez, users
We use this macro only on 3 places - remove it and replace by other
appropriate macros for printing messages.
Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
---
v1 -> v2 : replace NOTICE by WARNING for unknown RF chipset message.
drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
drivers/net/wireless/rt2x00/rt2x00.h | 2 --
drivers/net/wireless/rt2x00/rt2x00dev.c | 4 ++--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index a1de95e..1791260 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -80,7 +80,7 @@ static inline bool rt2800_is_305x_soc(struct rt2x00_dev *rt2x00dev)
rt2x00_rf(rt2x00dev, RF3022))
return true;
- NOTICE(rt2x00dev, "Unknown RF chipset on rt305x\n");
+ WARNING(rt2x00dev, "Unknown RF chipset on rt305x\n");
return false;
}
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 8ef11b6..ad73942 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -89,8 +89,6 @@
DEBUG_PRINTK_PROBE(KERN_ERR, "Error", __msg, ##__args)
#define WARNING(__dev, __msg, __args...) \
DEBUG_PRINTK_MSG(__dev, KERN_WARNING, "Warning", __msg, ##__args)
-#define NOTICE(__dev, __msg, __args...) \
- DEBUG_PRINTK_MSG(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
#define INFO(__dev, __msg, __args...) \
DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
#define DEBUG(__dev, __msg, __args...) \
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 96fffe8..07a9e10 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1440,7 +1440,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_remove_dev);
#ifdef CONFIG_PM
int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
{
- NOTICE(rt2x00dev, "Going to sleep.\n");
+ DEBUG(rt2x00dev, "Going to sleep.\n");
/*
* Prevent mac80211 from accessing driver while suspended.
@@ -1480,7 +1480,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_suspend);
int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
{
- NOTICE(rt2x00dev, "Waking up.\n");
+ DEBUG(rt2x00dev, "Waking up.\n");
/*
* Restore/enable extra components.
--
1.7.4.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 2/4 v2] rt2x00: remove NOTICE
2013-01-26 17:13 ` [PATCH 2/4 v2] " Stanislaw Gruszka
@ 2013-01-26 17:14 ` Ivo Van Doorn
0 siblings, 0 replies; 19+ messages in thread
From: Ivo Van Doorn @ 2013-01-26 17:14 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: John W. Linville, linux-wireless, Xose Vazquez Perez,
rt2x00 Users List
On Sat, Jan 26, 2013 at 6:13 PM, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
> We use this macro only on 3 places - remove it and replace by other
> appropriate macros for printing messages.
>
> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
> ---
> v1 -> v2 : replace NOTICE by WARNING for unknown RF chipset message.
>
> drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
> drivers/net/wireless/rt2x00/rt2x00.h | 2 --
> drivers/net/wireless/rt2x00/rt2x00dev.c | 4 ++--
> 3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index a1de95e..1791260 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -80,7 +80,7 @@ static inline bool rt2800_is_305x_soc(struct rt2x00_dev *rt2x00dev)
> rt2x00_rf(rt2x00dev, RF3022))
> return true;
>
> - NOTICE(rt2x00dev, "Unknown RF chipset on rt305x\n");
> + WARNING(rt2x00dev, "Unknown RF chipset on rt305x\n");
> return false;
> }
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 8ef11b6..ad73942 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -89,8 +89,6 @@
> DEBUG_PRINTK_PROBE(KERN_ERR, "Error", __msg, ##__args)
> #define WARNING(__dev, __msg, __args...) \
> DEBUG_PRINTK_MSG(__dev, KERN_WARNING, "Warning", __msg, ##__args)
> -#define NOTICE(__dev, __msg, __args...) \
> - DEBUG_PRINTK_MSG(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
> #define INFO(__dev, __msg, __args...) \
> DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
> #define DEBUG(__dev, __msg, __args...) \
> diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
> index 96fffe8..07a9e10 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
> @@ -1440,7 +1440,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_remove_dev);
> #ifdef CONFIG_PM
> int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
> {
> - NOTICE(rt2x00dev, "Going to sleep.\n");
> + DEBUG(rt2x00dev, "Going to sleep.\n");
>
> /*
> * Prevent mac80211 from accessing driver while suspended.
> @@ -1480,7 +1480,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_suspend);
>
> int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
> {
> - NOTICE(rt2x00dev, "Waking up.\n");
> + DEBUG(rt2x00dev, "Waking up.\n");
>
> /*
> * Restore/enable extra components.
> --
> 1.7.4.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/4] rt2x00: print warning, notice and info as default
2013-01-24 20:59 [PATCH 1/4] rt2x00: print warning, notice and info as default Stanislaw Gruszka
2013-01-24 21:00 ` [PATCH 2/4] rt2x00: remove NOTICE Stanislaw Gruszka
@ 2013-01-24 21:06 ` Gertjan van Wingerde
2013-01-25 8:46 ` Helmut Schaa
2013-02-02 23:50 ` Xose Vazquez Perez
2 siblings, 1 reply; 19+ messages in thread
From: Gertjan van Wingerde @ 2013-01-24 21:06 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: John W. Linville, Xose Vazquez Perez,
linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
Sent from my iPad
On 24 jan. 2013, at 21:59, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
> Some messages provide useful information, but are disabled without
> CONFIG_RT2X00_DEBUG=y, so enable them by default
>
> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Thanks for respinning.
> ---
> drivers/net/wireless/rt2x00/rt2x00.h | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 3e37c19..8ef11b6 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -88,11 +88,11 @@
> #define ERROR_PROBE(__msg, __args...) \
> DEBUG_PRINTK_PROBE(KERN_ERR, "Error", __msg, ##__args)
> #define WARNING(__dev, __msg, __args...) \
> - DEBUG_PRINTK(__dev, KERN_WARNING, "Warning", __msg, ##__args)
> + DEBUG_PRINTK_MSG(__dev, KERN_WARNING, "Warning", __msg, ##__args)
> #define NOTICE(__dev, __msg, __args...) \
> - DEBUG_PRINTK(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
> + DEBUG_PRINTK_MSG(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
> #define INFO(__dev, __msg, __args...) \
> - DEBUG_PRINTK(__dev, KERN_INFO, "Info", __msg, ##__args)
> + DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
> #define DEBUG(__dev, __msg, __args...) \
> DEBUG_PRINTK(__dev, KERN_DEBUG, "Debug", __msg, ##__args)
> #define EEPROM(__dev, __msg, __args...) \
> --
> 1.7.4.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/4] rt2x00: print warning, notice and info as default
2013-01-24 21:06 ` [PATCH 1/4] rt2x00: print warning, notice and info as default Gertjan van Wingerde
@ 2013-01-25 8:46 ` Helmut Schaa
2013-01-25 8:51 ` Gertjan van Wingerde
0 siblings, 1 reply; 19+ messages in thread
From: Helmut Schaa @ 2013-01-25 8:46 UTC (permalink / raw)
To: Gertjan van Wingerde
Cc: Stanislaw Gruszka, John W. Linville, Xose Vazquez Perez,
linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
On Thu, Jan 24, 2013 at 10:06 PM, Gertjan van Wingerde
<gwingerde@gmail.com> wrote:
> On 24 jan. 2013, at 21:59, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
>
>> Some messages provide useful information, but are disabled without
>> CONFIG_RT2X00_DEBUG=y, so enable them by default
>>
>> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
>
> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
>
> Thanks for respinning.
Fine with me, however, in the future we could think of just using
dynamic debug in rt2x00 (pr_debug etc). Would allow a user to
enable debug output selectively during runtime.
Helmut
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/4] rt2x00: print warning, notice and info as default
2013-01-25 8:46 ` Helmut Schaa
@ 2013-01-25 8:51 ` Gertjan van Wingerde
2013-01-25 8:52 ` Helmut Schaa
0 siblings, 1 reply; 19+ messages in thread
From: Gertjan van Wingerde @ 2013-01-25 8:51 UTC (permalink / raw)
To: Helmut Schaa
Cc: Stanislaw Gruszka, John W. Linville, Xose Vazquez Perez,
linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
On Fri, Jan 25, 2013 at 9:46 AM, Helmut Schaa
<helmut.schaa@googlemail.com> wrote:
> On Thu, Jan 24, 2013 at 10:06 PM, Gertjan van Wingerde
> <gwingerde@gmail.com> wrote:
>> On 24 jan. 2013, at 21:59, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
>>
>>> Some messages provide useful information, but are disabled without
>>> CONFIG_RT2X00_DEBUG=y, so enable them by default
>>>
>>> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
>>
>> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
>>
>> Thanks for respinning.
>
> Fine with me, however, in the future we could think of just using
> dynamic debug in rt2x00 (pr_debug etc). Would allow a user to
> enable debug output selectively during runtime.
>
I was thinking about the same and I have put the conversion to dynamic
debug on my TODO list
(unless someone beats me to it, I will look at this during the weekend).
---
Gertjan
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/4] rt2x00: print warning, notice and info as default
2013-01-25 8:51 ` Gertjan van Wingerde
@ 2013-01-25 8:52 ` Helmut Schaa
0 siblings, 0 replies; 19+ messages in thread
From: Helmut Schaa @ 2013-01-25 8:52 UTC (permalink / raw)
To: Gertjan van Wingerde
Cc: Stanislaw Gruszka, John W. Linville, Xose Vazquez Perez,
linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
On Fri, Jan 25, 2013 at 9:51 AM, Gertjan van Wingerde
<gwingerde@gmail.com> wrote:
> On Fri, Jan 25, 2013 at 9:46 AM, Helmut Schaa
> <helmut.schaa@googlemail.com> wrote:
>> On Thu, Jan 24, 2013 at 10:06 PM, Gertjan van Wingerde
>> <gwingerde@gmail.com> wrote:
>>> On 24 jan. 2013, at 21:59, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
>>>
>>>> Some messages provide useful information, but are disabled without
>>>> CONFIG_RT2X00_DEBUG=y, so enable them by default
>>>>
>>>> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
>>>
>>> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
>>>
>>> Thanks for respinning.
>>
>> Fine with me, however, in the future we could think of just using
>> dynamic debug in rt2x00 (pr_debug etc). Would allow a user to
>> enable debug output selectively during runtime.
>>
>
> I was thinking about the same and I have put the conversion to dynamic
> debug on my TODO list
> (unless someone beats me to it, I will look at this during the weekend).
No worries, I won't be able to beat you :D
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/4] rt2x00: print warning, notice and info as default
2013-01-24 20:59 [PATCH 1/4] rt2x00: print warning, notice and info as default Stanislaw Gruszka
2013-01-24 21:00 ` [PATCH 2/4] rt2x00: remove NOTICE Stanislaw Gruszka
2013-01-24 21:06 ` [PATCH 1/4] rt2x00: print warning, notice and info as default Gertjan van Wingerde
@ 2013-02-02 23:50 ` Xose Vazquez Perez
2013-02-02 23:53 ` Xose Vazquez Perez
2 siblings, 1 reply; 19+ messages in thread
From: Xose Vazquez Perez @ 2013-02-02 23:50 UTC (permalink / raw)
To: Stanislaw Gruszka; +Cc: John W. Linville, linux-wireless, users
On 01/24/2013 09:59 PM, Stanislaw Gruszka wrote:
> Some messages provide useful information, but are disabled without
> CONFIG_RT2X00_DEBUG=y, so enable them by default
>
> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
> ---
> drivers/net/wireless/rt2x00/rt2x00.h | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 3e37c19..8ef11b6 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -88,11 +88,11 @@
> #define ERROR_PROBE(__msg, __args...) \
> DEBUG_PRINTK_PROBE(KERN_ERR, "Error", __msg, ##__args)
> #define WARNING(__dev, __msg, __args...) \
> - DEBUG_PRINTK(__dev, KERN_WARNING, "Warning", __msg, ##__args)
> + DEBUG_PRINTK_MSG(__dev, KERN_WARNING, "Warning", __msg, ##__args)
> #define NOTICE(__dev, __msg, __args...) \
> - DEBUG_PRINTK(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
> + DEBUG_PRINTK_MSG(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
> #define INFO(__dev, __msg, __args...) \
> - DEBUG_PRINTK(__dev, KERN_INFO, "Info", __msg, ##__args)
> + DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
> #define DEBUG(__dev, __msg, __args...) \
> DEBUG_PRINTK(__dev, KERN_DEBUG, "Debug", __msg, ##__args)
> #define EEPROM(__dev, __msg, __args...) \
This patch was applied twice. The old one and this version.
See:
28f2bce9f8bbf704c86f8c684337f82c51592c81
def64521572d8330bfa6d855e278507100fdf180
^ permalink raw reply [flat|nested] 19+ messages in thread