* [patch 1/1] drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
@ 2011-11-15 22:55 akpm
2011-11-15 23:38 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: akpm @ 2011-11-15 22:55 UTC (permalink / raw)
To: davem; +Cc: netdev, akpm, jeffrey.t.kirsher, tomoya-linux, toshiharu-linux
From: Andrew Morton <akpm@linux-foundation.org>
Subject: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
In file included from drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c:22:
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h:24:1: warning: "pr_fmt" redefined
In file included from include/linux/kernel.h:20,
from include/linux/cache.h:4,
from include/linux/time.h:7,
from include/linux/stat.h:60,
from include/linux/module.h:10,
from drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c:21:
include/linux/printk.h:152:1: warning: this is the location of the previous definition
Cc: Tomoya <tomoya-linux@dsn.okisemi.com>
Cc: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 2 --
1 file changed, 2 deletions(-)
diff -puN drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h~drivers-net-ethernet-oki-semi-pch_gbe-pch_gbeh-remove-unused-macro-pr_fmt drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h~drivers-net-ethernet-oki-semi-pch_gbe-pch_gbeh-remove-unused-macro-pr_fmt
+++ a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
@@ -21,8 +21,6 @@
#ifndef _PCH_GBE_H_
#define _PCH_GBE_H_
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
#include <linux/mii.h>
#include <linux/delay.h>
#include <linux/pci.h>
_
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 1/1] drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
2011-11-15 22:55 [patch 1/1] drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt() akpm
@ 2011-11-15 23:38 ` David Miller
2011-11-15 23:52 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2011-11-15 23:38 UTC (permalink / raw)
To: akpm; +Cc: netdev, jeffrey.t.kirsher, tomoya-linux, toshiharu-linux
From: akpm@linux-foundation.org
Date: Tue, 15 Nov 2011 14:55:29 -0800
> From: Andrew Morton <akpm@linux-foundation.org>
> Subject: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
It's not unused, it just isn't properly coming before the linux/printk.h
include.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 1/1] drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
2011-11-15 23:38 ` David Miller
@ 2011-11-15 23:52 ` Andrew Morton
2011-11-15 23:56 ` [PATCH] pch_gbe: Move #include of module.h Joe Perches
2011-11-16 22:48 ` [patch 1/1] drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt() David Miller
0 siblings, 2 replies; 6+ messages in thread
From: Andrew Morton @ 2011-11-15 23:52 UTC (permalink / raw)
To: David Miller; +Cc: netdev, jeffrey.t.kirsher, tomoya-linux, toshiharu-linux
On Tue, 15 Nov 2011 18:38:08 -0500 (EST)
David Miller <davem@davemloft.net> wrote:
> From: akpm@linux-foundation.org
> Date: Tue, 15 Nov 2011 14:55:29 -0800
>
> > From: Andrew Morton <akpm@linux-foundation.org>
> > Subject: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
>
> It's not unused, it just isn't properly coming before the linux/printk.h
> include.
Oh well, I'll drop it. Please treat the patch as a bug report instead.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] pch_gbe: Move #include of module.h
2011-11-15 23:52 ` Andrew Morton
@ 2011-11-15 23:56 ` Joe Perches
2011-11-16 22:49 ` David Miller
2011-11-16 22:48 ` [patch 1/1] drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt() David Miller
1 sibling, 1 reply; 6+ messages in thread
From: Joe Perches @ 2011-11-15 23:56 UTC (permalink / raw)
To: Andrew Morton
Cc: David Miller, netdev, jeffrey.t.kirsher, tomoya-linux,
toshiharu-linux
The first #include must be pch_gbe.h as it
does a #define of pr_fmt.
Signed-off-by: Joe Perches <joe@perches.com>
---
.../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
index 9c075ea..9cb5f91 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
@@ -18,8 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <linux/module.h> /* for __MODULE_STRING */
#include "pch_gbe.h"
+#include <linux/module.h> /* for __MODULE_STRING */
#define OPTION_UNSET -1
#define OPTION_DISABLED 0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [patch 1/1] drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
2011-11-15 23:52 ` Andrew Morton
2011-11-15 23:56 ` [PATCH] pch_gbe: Move #include of module.h Joe Perches
@ 2011-11-16 22:48 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2011-11-16 22:48 UTC (permalink / raw)
To: akpm; +Cc: netdev, jeffrey.t.kirsher, tomoya-linux, toshiharu-linux
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 15 Nov 2011 15:52:10 -0800
> On Tue, 15 Nov 2011 18:38:08 -0500 (EST)
> David Miller <davem@davemloft.net> wrote:
>
>> From: akpm@linux-foundation.org
>> Date: Tue, 15 Nov 2011 14:55:29 -0800
>>
>> > From: Andrew Morton <akpm@linux-foundation.org>
>> > Subject: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
>>
>> It's not unused, it just isn't properly coming before the linux/printk.h
>> include.
>
> Oh well, I'll drop it. Please treat the patch as a bug report instead.
Joe Perches took care of it, I just applied a proper fix from him.
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] pch_gbe: Move #include of module.h
2011-11-15 23:56 ` [PATCH] pch_gbe: Move #include of module.h Joe Perches
@ 2011-11-16 22:49 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2011-11-16 22:49 UTC (permalink / raw)
To: joe; +Cc: akpm, netdev, jeffrey.t.kirsher, tomoya-linux, toshiharu-linux
From: Joe Perches <joe@perches.com>
Date: Tue, 15 Nov 2011 15:56:14 -0800
> The first #include must be pch_gbe.h as it
> does a #define of pr_fmt.
>
> Signed-off-by: Joe Perches <joe@perches.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-11-16 22:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-15 22:55 [patch 1/1] drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt() akpm
2011-11-15 23:38 ` David Miller
2011-11-15 23:52 ` Andrew Morton
2011-11-15 23:56 ` [PATCH] pch_gbe: Move #include of module.h Joe Perches
2011-11-16 22:49 ` David Miller
2011-11-16 22:48 ` [patch 1/1] drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt() David Miller
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).