* [PATCH] blackfin: Fixup export.h includes
@ 2011-11-11 10:06 Lars-Peter Clausen
2011-11-11 10:54 ` Bob Liu
2011-11-11 14:50 ` Mike Frysinger
0 siblings, 2 replies; 5+ messages in thread
From: Lars-Peter Clausen @ 2011-11-11 10:06 UTC (permalink / raw)
To: Mike Frysinger, Sonic Zhang
Cc: Paul Gortmaker, uclinux-dist-devel, linux-kernel, Lars-Peter Clausen
Commit 8dc7a9c84 ("blackfin: Add export.h to files using
EXPORT_SYMBOL/THIS_MODULE") inserted some of the include statements into
sections protected by an unrelated #if CONFIG_... statement. This can cause,
depending on the configuration used, warnings like this one:
arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: data definition has no type or storage class
arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: type defaults to ‘int’ in declaration of ‘EXPORT_SYMBOL’
arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: parameter names (without types) in function declaration
This patch fixes it by moving the includes out of the #if protected sections.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
arch/blackfin/mach-bf527/boards/cm_bf527.c | 2 +-
arch/blackfin/mach-bf527/boards/ezbrd.c | 2 +-
arch/blackfin/mach-bf537/boards/cm_bf537e.c | 2 +-
arch/blackfin/mach-bf537/boards/cm_bf537u.c | 2 +-
arch/blackfin/mach-bf537/boards/dnp5370.c | 2 +-
arch/blackfin/mach-bf537/boards/pnav10.c | 1 +
arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
arch/blackfin/mach-bf537/boards/tcm_bf537.c | 2 +-
8 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
index c13065b..cd28969 100644
--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -8,6 +8,7 @@
*/
#include <linux/device.h>
+#include <linux/export.h>
#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@@ -811,7 +812,6 @@ static struct platform_device bfin_sport1_uart_device = {
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
#include <linux/input.h>
#include <linux/gpio_keys.h>
-#include <linux/export.h>
static struct gpio_keys_button bfin_gpio_keys_table[] = {
{BTN_0, GPIO_PF14, 1, "gpio-keys: BTN0"},
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c
index 2963c35..9f792ea 100644
--- a/arch/blackfin/mach-bf527/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c
@@ -7,6 +7,7 @@
*/
#include <linux/device.h>
+#include <linux/export.h>
#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@@ -684,7 +685,6 @@ static struct platform_device bfin_sport1_uart_device = {
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
#include <linux/input.h>
#include <linux/gpio_keys.h>
-#include <linux/export.h>
static struct gpio_keys_button bfin_gpio_keys_table[] = {
{BTN_0, GPIO_PG0, 1, "gpio-keys: BTN0"},
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
index 82e4cc3..604a430 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
@@ -8,6 +8,7 @@
*/
#include <linux/device.h>
+#include <linux/export.h>
#include <linux/etherdevice.h>
#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
@@ -579,7 +580,6 @@ static struct platform_device bfin_sport1_uart_device = {
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
#include <linux/bfin_mac.h>
-#include <linux/export.h>
static const unsigned short bfin_mac_peripherals[] = P_MII0;
static struct bfin_phydev_platform_data bfin_phydev_data[] = {
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
index e9f1964..d916b46 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
@@ -9,6 +9,7 @@
#include <linux/device.h>
#include <linux/etherdevice.h>
+#include <linux/export.h>
#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@@ -544,7 +545,6 @@ static struct platform_device bfin_sport1_uart_device = {
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
#include <linux/bfin_mac.h>
-#include <linux/export.h>
static const unsigned short bfin_mac_peripherals[] = P_MII0;
static struct bfin_phydev_platform_data bfin_phydev_data[] = {
diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
index 5b22598..5f30722 100644
--- a/arch/blackfin/mach-bf537/boards/dnp5370.c
+++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
@@ -12,6 +12,7 @@
*/
#include <linux/device.h>
+#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/io.h>
@@ -49,7 +50,6 @@ static struct platform_device rtc_device = {
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
#include <linux/bfin_mac.h>
-#include <linux/export.h>
static const unsigned short bfin_mac_peripherals[] = P_RMII0;
static struct bfin_phydev_platform_data bfin_phydev_data[] = {
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 1567dd8..aebd31c 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -8,6 +8,7 @@
#include <linux/device.h>
#include <linux/etherdevice.h>
+#include <linux/export.h>
#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index b04bfb5..13344c7 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -7,6 +7,7 @@
*/
#include <linux/device.h>
+#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/io.h>
@@ -2002,7 +2003,6 @@ static struct adp8870_backlight_platform_data adp8870_pdata = {
#if defined(CONFIG_BACKLIGHT_ADP8860) || defined(CONFIG_BACKLIGHT_ADP8860_MODULE)
#include <linux/i2c/adp8860.h>
-#include <linux/export.h>
static struct led_info adp8860_leds[] = {
{
.name = "adp8860-led7",
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index e58c9bc..6917ce2 100644
--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
@@ -9,6 +9,7 @@
#include <linux/device.h>
#include <linux/etherdevice.h>
+#include <linux/export.h>
#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@@ -546,7 +547,6 @@ static struct platform_device bfin_sport1_uart_device = {
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
#include <linux/bfin_mac.h>
-#include <linux/export.h>
static const unsigned short bfin_mac_peripherals[] = P_MII0;
static struct bfin_phydev_platform_data bfin_phydev_data[] = {
--
1.7.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] blackfin: Fixup export.h includes
2011-11-11 10:06 [PATCH] blackfin: Fixup export.h includes Lars-Peter Clausen
@ 2011-11-11 10:54 ` Bob Liu
2011-11-11 14:50 ` Mike Frysinger
2011-11-11 15:53 ` Paul Gortmaker
2011-11-11 14:50 ` Mike Frysinger
1 sibling, 2 replies; 5+ messages in thread
From: Bob Liu @ 2011-11-11 10:54 UTC (permalink / raw)
To: Lars-Peter Clausen
Cc: Mike Frysinger, Sonic Zhang, Paul Gortmaker, uclinux-dist-devel,
linux-kernel
On Fri, Nov 11, 2011 at 6:06 PM, Lars-Peter Clausen <lars@metafoo.de> wrote:
> Commit 8dc7a9c84 ("blackfin: Add export.h to files using
> EXPORT_SYMBOL/THIS_MODULE") inserted some of the include statements into
> sections protected by an unrelated #if CONFIG_... statement. This can cause,
> depending on the configuration used, warnings like this one:
>
> arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: data definition has no type or storage class
> arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: type defaults to ‘int’ in declaration of ‘EXPORT_SYMBOL’
> arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: parameter names (without types) in function declaration
>
> This patch fixes it by moving the includes out of the #if protected sections.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> ---
> arch/blackfin/mach-bf527/boards/cm_bf527.c | 2 +-
> arch/blackfin/mach-bf527/boards/ezbrd.c | 2 +-
> arch/blackfin/mach-bf537/boards/cm_bf537e.c | 2 +-
> arch/blackfin/mach-bf537/boards/cm_bf537u.c | 2 +-
> arch/blackfin/mach-bf537/boards/dnp5370.c | 2 +-
> arch/blackfin/mach-bf537/boards/pnav10.c | 1 +
> arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
> arch/blackfin/mach-bf537/boards/tcm_bf537.c | 2 +-
> 8 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
> index c13065b..cd28969 100644
> --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
> +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c
> @@ -8,6 +8,7 @@
> */
>
> #include <linux/device.h>
> +#include <linux/export.h>
> #include <linux/platform_device.h>
> #include <linux/mtd/mtd.h>
> #include <linux/mtd/partitions.h>
> @@ -811,7 +812,6 @@ static struct platform_device bfin_sport1_uart_device = {
> #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
> #include <linux/input.h>
> #include <linux/gpio_keys.h>
> -#include <linux/export.h>
>
> static struct gpio_keys_button bfin_gpio_keys_table[] = {
> {BTN_0, GPIO_PF14, 1, "gpio-keys: BTN0"},
> diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c
> index 2963c35..9f792ea 100644
> --- a/arch/blackfin/mach-bf527/boards/ezbrd.c
> +++ b/arch/blackfin/mach-bf527/boards/ezbrd.c
> @@ -7,6 +7,7 @@
> */
>
> #include <linux/device.h>
> +#include <linux/export.h>
> #include <linux/platform_device.h>
> #include <linux/mtd/mtd.h>
> #include <linux/mtd/partitions.h>
> @@ -684,7 +685,6 @@ static struct platform_device bfin_sport1_uart_device = {
> #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
> #include <linux/input.h>
> #include <linux/gpio_keys.h>
> -#include <linux/export.h>
>
> static struct gpio_keys_button bfin_gpio_keys_table[] = {
> {BTN_0, GPIO_PG0, 1, "gpio-keys: BTN0"},
> diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
> index 82e4cc3..604a430 100644
> --- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c
> +++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
> @@ -8,6 +8,7 @@
> */
>
> #include <linux/device.h>
> +#include <linux/export.h>
> #include <linux/etherdevice.h>
> #include <linux/platform_device.h>
> #include <linux/mtd/mtd.h>
> @@ -579,7 +580,6 @@ static struct platform_device bfin_sport1_uart_device = {
>
> #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
> #include <linux/bfin_mac.h>
> -#include <linux/export.h>
> static const unsigned short bfin_mac_peripherals[] = P_MII0;
>
> static struct bfin_phydev_platform_data bfin_phydev_data[] = {
> diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
> index e9f1964..d916b46 100644
> --- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c
> +++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
> @@ -9,6 +9,7 @@
>
> #include <linux/device.h>
> #include <linux/etherdevice.h>
> +#include <linux/export.h>
> #include <linux/platform_device.h>
> #include <linux/mtd/mtd.h>
> #include <linux/mtd/partitions.h>
> @@ -544,7 +545,6 @@ static struct platform_device bfin_sport1_uart_device = {
>
> #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
> #include <linux/bfin_mac.h>
> -#include <linux/export.h>
> static const unsigned short bfin_mac_peripherals[] = P_MII0;
>
> static struct bfin_phydev_platform_data bfin_phydev_data[] = {
> diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
> index 5b22598..5f30722 100644
> --- a/arch/blackfin/mach-bf537/boards/dnp5370.c
> +++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
> @@ -12,6 +12,7 @@
> */
>
> #include <linux/device.h>
> +#include <linux/export.h>
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
> #include <linux/io.h>
> @@ -49,7 +50,6 @@ static struct platform_device rtc_device = {
>
> #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
> #include <linux/bfin_mac.h>
> -#include <linux/export.h>
> static const unsigned short bfin_mac_peripherals[] = P_RMII0;
>
> static struct bfin_phydev_platform_data bfin_phydev_data[] = {
> diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
> index 1567dd8..aebd31c 100644
> --- a/arch/blackfin/mach-bf537/boards/pnav10.c
> +++ b/arch/blackfin/mach-bf537/boards/pnav10.c
> @@ -8,6 +8,7 @@
>
> #include <linux/device.h>
> #include <linux/etherdevice.h>
> +#include <linux/export.h>
> #include <linux/platform_device.h>
> #include <linux/mtd/mtd.h>
> #include <linux/mtd/partitions.h>
> diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
> index b04bfb5..13344c7 100644
> --- a/arch/blackfin/mach-bf537/boards/stamp.c
> +++ b/arch/blackfin/mach-bf537/boards/stamp.c
> @@ -7,6 +7,7 @@
> */
>
> #include <linux/device.h>
> +#include <linux/export.h>
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
> #include <linux/io.h>
> @@ -2002,7 +2003,6 @@ static struct adp8870_backlight_platform_data adp8870_pdata = {
>
> #if defined(CONFIG_BACKLIGHT_ADP8860) || defined(CONFIG_BACKLIGHT_ADP8860_MODULE)
> #include <linux/i2c/adp8860.h>
> -#include <linux/export.h>
> static struct led_info adp8860_leds[] = {
> {
> .name = "adp8860-led7",
> diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
> index e58c9bc..6917ce2 100644
> --- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
> +++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
> @@ -9,6 +9,7 @@
>
> #include <linux/device.h>
> #include <linux/etherdevice.h>
> +#include <linux/export.h>
> #include <linux/platform_device.h>
> #include <linux/mtd/mtd.h>
> #include <linux/mtd/partitions.h>
> @@ -546,7 +547,6 @@ static struct platform_device bfin_sport1_uart_device = {
>
> #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
> #include <linux/bfin_mac.h>
> -#include <linux/export.h>
> static const unsigned short bfin_mac_peripherals[] = P_MII0;
>
> static struct bfin_phydev_platform_data bfin_phydev_data[] = {
> --
> 1.7.7.1
>
>
Thanks! I'll pick it.
Acked-by: Bob Liu <lliubbo@gmail.com>
--
Regards,
--Bob
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] blackfin: Fixup export.h includes
2011-11-11 10:54 ` Bob Liu
@ 2011-11-11 14:50 ` Mike Frysinger
2011-11-11 15:53 ` Paul Gortmaker
1 sibling, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2011-11-11 14:50 UTC (permalink / raw)
To: Bob Liu
Cc: Lars-Peter Clausen, Sonic Zhang, Paul Gortmaker,
uclinux-dist-devel, linux-kernel
[-- Attachment #1: Type: Text/Plain, Size: 227 bytes --]
On Friday 11 November 2011 05:54:36 Bob Liu wrote:
> Thanks! I'll pick it.
>
> Acked-by: Bob Liu <lliubbo@gmail.com>
if you pick up patches and push through your tree, you add a s-o-b tag, not an
acked-by tag
-mike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] blackfin: Fixup export.h includes
2011-11-11 10:06 [PATCH] blackfin: Fixup export.h includes Lars-Peter Clausen
2011-11-11 10:54 ` Bob Liu
@ 2011-11-11 14:50 ` Mike Frysinger
1 sibling, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2011-11-11 14:50 UTC (permalink / raw)
To: Lars-Peter Clausen
Cc: Sonic Zhang, Paul Gortmaker, uclinux-dist-devel, linux-kernel
[-- Attachment #1: Type: Text/Plain, Size: 51 bytes --]
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] blackfin: Fixup export.h includes
2011-11-11 10:54 ` Bob Liu
2011-11-11 14:50 ` Mike Frysinger
@ 2011-11-11 15:53 ` Paul Gortmaker
1 sibling, 0 replies; 5+ messages in thread
From: Paul Gortmaker @ 2011-11-11 15:53 UTC (permalink / raw)
To: Bob Liu
Cc: Lars-Peter Clausen, Mike Frysinger, Sonic Zhang,
uclinux-dist-devel, linux-kernel
On 11-11-11 05:54 AM, Bob Liu wrote:
> On Fri, Nov 11, 2011 at 6:06 PM, Lars-Peter Clausen <lars@metafoo.de> wrote:
>> Commit 8dc7a9c84 ("blackfin: Add export.h to files using
>> EXPORT_SYMBOL/THIS_MODULE") inserted some of the include statements into
>> sections protected by an unrelated #if CONFIG_... statement. This can cause,
>> depending on the configuration used, warnings like this one:
>>
>> arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: data definition has no type or storage class
>> arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: type defaults to ‘int’ in declaration of ‘EXPORT_SYMBOL’
>> arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: parameter names (without types) in function declaration
>>
>> This patch fixes it by moving the includes out of the #if protected sections.
>>
>> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
[...]
>>
>
> Thanks! I'll pick it.
>
> Acked-by: Bob Liu <lliubbo@gmail.com>
Looks fine to me as well. I'm assuming it will make it in
tree via Bob, as per above.
Thanks,
Paul.
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-11-11 15:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-11 10:06 [PATCH] blackfin: Fixup export.h includes Lars-Peter Clausen
2011-11-11 10:54 ` Bob Liu
2011-11-11 14:50 ` Mike Frysinger
2011-11-11 15:53 ` Paul Gortmaker
2011-11-11 14:50 ` Mike Frysinger
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).