* [PATCH V2] net/stmmac: Move "#include <linux/platform_device.h>" to linux/stmmac.h
@ 2011-05-03 4:36 Viresh Kumar
2011-05-03 5:36 ` Giuseppe CAVALLARO
0 siblings, 1 reply; 3+ messages in thread
From: Viresh Kumar @ 2011-05-03 4:36 UTC (permalink / raw)
To: peppe.cavallaro, davem
Cc: netdev, shiraz.hashim, armando.visconti, deepak.sikri,
viresh.linux, Viresh Kumar
stmmac.h uses struct platform_device and doesn't include
<linux/platform_device.h>. Whereas drivers/net/stmmac/stmmac.h includes it, but
doesn't directly use it. And so we get following compilation warning while using
this file:
warning: ‘struct platform_device’ declared inside parameter list
This patch includes <linux/platform_device.h> in linux/stmmac.h and removes it
from drivers/net/stmmac/stmmac.h
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
---
drivers/net/stmmac/stmmac.h | 1 -
include/linux/stmmac.h | 2 ++
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/stmmac/stmmac.h
index 5f06c47..2b076b3 100644
--- a/drivers/net/stmmac/stmmac.h
+++ b/drivers/net/stmmac/stmmac.h
@@ -21,7 +21,6 @@
*******************************************************************************/
#define DRV_MODULE_VERSION "Nov_2010"
-#include <linux/platform_device.h>
#include <linux/stmmac.h>
#include "common.h"
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index f29197a..9529e49 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -26,6 +26,8 @@
#ifndef __STMMAC_PLATFORM_DATA
#define __STMMAC_PLATFORM_DATA
+#include <linux/platform_device.h>
+
/* platform data for platform device structure's platform_data field */
/* Private data for the STM on-board ethernet driver */
--
1.7.2.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V2] net/stmmac: Move "#include <linux/platform_device.h>" to linux/stmmac.h
2011-05-03 4:36 [PATCH V2] net/stmmac: Move "#include <linux/platform_device.h>" to linux/stmmac.h Viresh Kumar
@ 2011-05-03 5:36 ` Giuseppe CAVALLARO
2011-05-03 23:09 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Giuseppe CAVALLARO @ 2011-05-03 5:36 UTC (permalink / raw)
To: Viresh Kumar
Cc: davem, netdev, shiraz.hashim, armando.visconti, deepak.sikri,
viresh.linux
On 5/3/2011 6:36 AM, Viresh Kumar wrote:
> stmmac.h uses struct platform_device and doesn't include
> <linux/platform_device.h>. Whereas drivers/net/stmmac/stmmac.h includes it, but
> doesn't directly use it. And so we get following compilation warning while using
> this file:
> warning: ‘struct platform_device’ declared inside parameter list
>
> This patch includes <linux/platform_device.h> in linux/stmmac.h and removes it
> from drivers/net/stmmac/stmmac.h
>
> Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> ---
> drivers/net/stmmac/stmmac.h | 1 -
> include/linux/stmmac.h | 2 ++
> 2 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/stmmac/stmmac.h
> index 5f06c47..2b076b3 100644
> --- a/drivers/net/stmmac/stmmac.h
> +++ b/drivers/net/stmmac/stmmac.h
> @@ -21,7 +21,6 @@
> *******************************************************************************/
>
> #define DRV_MODULE_VERSION "Nov_2010"
> -#include <linux/platform_device.h>
> #include <linux/stmmac.h>
>
> #include "common.h"
> diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
> index f29197a..9529e49 100644
> --- a/include/linux/stmmac.h
> +++ b/include/linux/stmmac.h
> @@ -26,6 +26,8 @@
> #ifndef __STMMAC_PLATFORM_DATA
> #define __STMMAC_PLATFORM_DATA
>
> +#include <linux/platform_device.h>
> +
> /* platform data for platform device structure's platform_data field */
>
> /* Private data for the STM on-board ethernet driver */
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH V2] net/stmmac: Move "#include <linux/platform_device.h>" to linux/stmmac.h
2011-05-03 5:36 ` Giuseppe CAVALLARO
@ 2011-05-03 23:09 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2011-05-03 23:09 UTC (permalink / raw)
To: peppe.cavallaro
Cc: viresh.kumar, netdev, shiraz.hashim, armando.visconti,
deepak.sikri, viresh.linux
From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date: Tue, 03 May 2011 07:36:55 +0200
> On 5/3/2011 6:36 AM, Viresh Kumar wrote:
>> stmmac.h uses struct platform_device and doesn't include
>> <linux/platform_device.h>. Whereas drivers/net/stmmac/stmmac.h includes it, but
>> doesn't directly use it. And so we get following compilation warning while using
>> this file:
>> warning: ‘struct platform_device’ declared inside parameter list
>>
>> This patch includes <linux/platform_device.h> in linux/stmmac.h and removes it
>> from drivers/net/stmmac/stmmac.h
>>
>> Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
>
> Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Applied to net-next-2.6, thanks everyone.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-03 23:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-03 4:36 [PATCH V2] net/stmmac: Move "#include <linux/platform_device.h>" to linux/stmmac.h Viresh Kumar
2011-05-03 5:36 ` Giuseppe CAVALLARO
2011-05-03 23:09 ` 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).