diff mbox

[v2,08/18] brcmfmac: define pr_fmt in one place

Message ID 1357158010-9767-1-git-send-email-arend@broadcom.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Arend van Spriel Jan. 2, 2013, 8:20 p.m. UTC 
Several source files (but not all) define the pr_fmt() macro in exactly
the same way. Instead this commit defines it in a header file so driver
logging is consistent.

Cc: Joe Perches <joe@perches.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
Hi John,

Joe caught this so here is the replacement patch for previous patch with
message id: <1357136572-18273-9-git-send-email-arend@broadcom.com>

Regards,
Arend
---
 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c       |    2 --
 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c |    2 --
 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c      |    2 --
 drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c   |    2 --
 drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h      |    4 ++++
 drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c    |    2 --
 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c     |    2 --
 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c    |    2 --
 drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  |    2 --
 9 files changed, 4 insertions(+), 16 deletions(-)

Comments

Joe Perches Jan. 2, 2013, 8:34 p.m. UTC | #1 
On Wed, 2013-01-02 at 21:20 +0100, Arend van Spriel wrote:
> Several source files (but not all) define the pr_fmt() macro in exactly
> the same way. Instead this commit defines it in a header file so driver
> logging is consistent.
> 
> Cc: Joe Perches <joe@perches.com>
> Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>
> ---
> Hi John,
> 
> Joe caught this so here is the replacement patch for previous patch with
> message id: <1357136572-18273-9-git-send-email-arend@broadcom.com>
> 
> Regards,
> Arend
> ---
>  drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c       |    2 --
>  drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c |    2 --
>  drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c      |    2 --
>  drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c   |    2 --
>  drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h      |    4 ++++
>  drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c    |    2 --
>  drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c     |    2 --
>  drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c    |    2 --
>  drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  |    2 --
>  9 files changed, 4 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> index be35a2f..11fd1c7 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> @@ -15,8 +15,6 @@
>   */
>  /* ****************** SDIO CARD Interface Functions **************************/
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <linux/types.h>
>  #include <linux/netdevice.h>
>  #include <linux/export.h>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
> index d33e559..d92d373 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
> @@ -14,8 +14,6 @@
>   * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>   */
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <linux/types.h>
>  #include <linux/netdevice.h>
>  #include <linux/mmc/sdio.h>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
> index 8392355..0c83998 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
> @@ -19,8 +19,6 @@
>   * For certain dcmd codes, the dongle interprets string data from the host.
>   ******************************************************************************/
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <linux/types.h>
>  #include <linux/netdevice.h>
>  
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
> index f8b52e5..4544342 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
> @@ -14,8 +14,6 @@
>   * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>   */
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <linux/kernel.h>
>  #include <linux/string.h>
>  #include <linux/netdevice.h>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
> index f2ab01c..ea3f5f5 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
> @@ -34,6 +34,10 @@
>  #define BRCMF_SCAN_VAL	0x4000
>  #define BRCMF_CONN_VAL	0x8000
>  
> +/* set default print format */
> +#undef pr_fmt
> +#define pr_fmt(fmt)		KBUILD_MODNAME ": " fmt
> +

The only negative I see to this is that
any pr_<level> in any include file like:

include/linux/netdevice.h:1892:              pr_info("netif_stop_queue() cannot be called before register_netdev()\n");

may not be prefixed.

I expect that one day all these 
#define pr_fmt(fmt) KBUILD_MODNAME etc...
will be made unnecessary as kernel.h should
be eventually changed to make it the default.

Something like:

https://lkml.org/lkml/2012/3/27/247


--
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
Arend van Spriel Jan. 2, 2013, 8:52 p.m. UTC | #2 
On 01/02/2013 09:34 PM, Joe Perches wrote:
> On Wed, 2013-01-02 at 21:20 +0100, Arend van Spriel wrote:
>> Several source files (but not all) define the pr_fmt() macro in exactly
>> the same way. Instead this commit defines it in a header file so driver
>> logging is consistent.
>>
>> Cc: Joe Perches <joe@perches.com>
>> Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
>> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>> ---
>> Hi John,
>>
>> Joe caught this so here is the replacement patch for previous patch with
>> message id: <1357136572-18273-9-git-send-email-arend@broadcom.com>
>>
>> Regards,
>> Arend
>> ---
>>  drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c       |    2 --
>>  drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c |    2 --
>>  drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c      |    2 --
>>  drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c   |    2 --
>>  drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h      |    4 ++++
>>  drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c    |    2 --
>>  drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c     |    2 --
>>  drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c    |    2 --
>>  drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  |    2 --
>>  9 files changed, 4 insertions(+), 16 deletions(-)
>>
>> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
>> index be35a2f..11fd1c7 100644
>> --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
>> +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
>> @@ -15,8 +15,6 @@
>>   */
>>  /* ****************** SDIO CARD Interface Functions **************************/
>>  
>> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>> -
>>  #include <linux/types.h>
>>  #include <linux/netdevice.h>
>>  #include <linux/export.h>
>> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
>> index d33e559..d92d373 100644
>> --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
>> +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
>> @@ -14,8 +14,6 @@
>>   * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>>   */
>>  
>> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>> -
>>  #include <linux/types.h>
>>  #include <linux/netdevice.h>
>>  #include <linux/mmc/sdio.h>
>> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
>> index 8392355..0c83998 100644
>> --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
>> +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
>> @@ -19,8 +19,6 @@
>>   * For certain dcmd codes, the dongle interprets string data from the host.
>>   ******************************************************************************/
>>  
>> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>> -
>>  #include <linux/types.h>
>>  #include <linux/netdevice.h>
>>  
>> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
>> index f8b52e5..4544342 100644
>> --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
>> +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
>> @@ -14,8 +14,6 @@
>>   * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>>   */
>>  
>> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>> -
>>  #include <linux/kernel.h>
>>  #include <linux/string.h>
>>  #include <linux/netdevice.h>
>> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
>> index f2ab01c..ea3f5f5 100644
>> --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
>> +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
>> @@ -34,6 +34,10 @@
>>  #define BRCMF_SCAN_VAL	0x4000
>>  #define BRCMF_CONN_VAL	0x8000
>>  
>> +/* set default print format */
>> +#undef pr_fmt
>> +#define pr_fmt(fmt)		KBUILD_MODNAME ": " fmt
>> +
> 
> The only negative I see to this is that
> any pr_<level> in any include file like:
> 
> include/linux/netdevice.h:1892:              pr_info("netif_stop_queue() cannot be called before register_netdev()\n");
> 
> may not be prefixed.
> 
> I expect that one day all these 
> #define pr_fmt(fmt) KBUILD_MODNAME etc...
> will be made unnecessary as kernel.h should
> be eventually changed to make it the default.
> 
> Something like:
> 
> https://lkml.org/lkml/2012/3/27/247

Got my vote for that.

Regards,
Arend


--
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
diff mbox

Patch

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index be35a2f..11fd1c7 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -15,8 +15,6 @@ 
  */
 /* ****************** SDIO CARD Interface Functions **************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/export.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index d33e559..d92d373 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -14,8 +14,6 @@ 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/mmc/sdio.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
index 8392355..0c83998 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
@@ -19,8 +19,6 @@ 
  * For certain dcmd codes, the dongle interprets string data from the host.
  ******************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/types.h>
 #include <linux/netdevice.h>
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index f8b52e5..4544342 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -14,8 +14,6 @@ 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
index f2ab01c..ea3f5f5 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
@@ -34,6 +34,10 @@ 
 #define BRCMF_SCAN_VAL	0x4000
 #define BRCMF_CONN_VAL	0x8000
 
+/* set default print format */
+#undef pr_fmt
+#define pr_fmt(fmt)		KBUILD_MODNAME ": " fmt
+
 /* Macro for error messages. net_ratelimit() is used when driver
  * debugging is not selected. When debugging the driver error
  * messages are as important as other tracing or even more so.
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 16efcb4..6520b58 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -14,8 +14,6 @@ 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/kernel.h>
 #include <linux/etherdevice.h>
 #include <linux/module.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index cf857f1..651474b 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -14,8 +14,6 @@ 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index b1bb46c..14be2d5 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -15,8 +15,6 @@ 
  */
 /* ***** SDIO interface chip backplane handle functions ***** */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/mmc/card.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index ee4eb44..1ec2d57 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -16,8 +16,6 @@ 
 
 /* Toplevel file. Relies on dhd_linux.c to send commands to the dongle. */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/kernel.h>
 #include <linux/etherdevice.h>
 #include <net/cfg80211.h>