Patchwork [net] ixp4xx_hss: fix build failure after logging conversion

login
register
mail settings
Submitter Florian Fainelli
Date Sept. 10, 2012, 8:43 a.m.
Message ID <1347266590-884-1-git-send-email-florian@openwrt.org>
Download mbox | patch
Permalink /patch/182825/
State Superseded
Delegated to: David Miller
Headers show

Comments

Florian Fainelli - Sept. 10, 2012, 8:43 a.m.
Commit c75bb2c6f0cf455c23e60f14d780e841dd47f801 (ixp4xx_hss: Update to
current logging forms) converted the ixp4xx_hss module to use the current
logging macros, but forgot to include linux/module.h, leading to the
following build failures:

  CC [M]  drivers/net/wan/ixp4xx_hss.o
 drivers/net/wan/ixp4xx_hss.c:1412:20: error: expected ';', ',' or ')'
 before string constant
 drivers/net/wan/ixp4xx_hss.c:1413:25: error: expected ';', ',' or ')'
 before string constant
 drivers/net/wan/ixp4xx_hss.c:1414:21: error: expected ';', ',' or ')'
 before string constant
 drivers/net/wan/ixp4xx_hss.c:1415:19: error: expected ';', ',' or ')'
 before string constant
 make[8]: *** [drivers/net/wan/ixp4xx_hss.o] Error 1

CC: stable@vger.kernel.org
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
[stable: 3.1+]

 drivers/net/wan/ixp4xx_hss.c |    1 +
 1 file changed, 1 insertion(+)
Joe Perches - Sept. 10, 2012, 9:04 a.m.
On Mon, 2012-09-10 at 10:43 +0200, Florian Fainelli wrote:
> Commit c75bb2c6f0cf455c23e60f14d780e841dd47f801 (ixp4xx_hss: Update to
> current logging forms) converted the ixp4xx_hss module to use the current
> logging macros, but forgot to include linux/module.h, leading to the
> following build failures:

Bad explanation.
This commit had nothing to do with any missing module.h.


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Florian Fainelli - Sept. 10, 2012, 9:35 a.m.
On Monday 10 September 2012 02:04:15 Joe Perches wrote:
> On Mon, 2012-09-10 at 10:43 +0200, Florian Fainelli wrote:
> > Commit c75bb2c6f0cf455c23e60f14d780e841dd47f801 (ixp4xx_hss: Update to
> > current logging forms) converted the ixp4xx_hss module to use the current
> > logging macros, but forgot to include linux/module.h, leading to the
> > following build failures:
> 
> Bad explanation.
> This commit had nothing to do with any missing module.h.

You are right, this issue dates back from day one when this driver got merged, 
I will repost a v2 with the proper commit.
--
Florian
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ben Hutchings - Sept. 10, 2012, 5:04 p.m.
On Mon, 2012-09-10 at 10:43 +0200, Florian Fainelli wrote:
> Commit c75bb2c6f0cf455c23e60f14d780e841dd47f801 (ixp4xx_hss: Update to
> current logging forms) converted the ixp4xx_hss module to use the current
> logging macros, but forgot to include linux/module.h, leading to the
> following build failures:
> 
>   CC [M]  drivers/net/wan/ixp4xx_hss.o
>  drivers/net/wan/ixp4xx_hss.c:1412:20: error: expected ';', ',' or ')'
>  before string constant
>  drivers/net/wan/ixp4xx_hss.c:1413:25: error: expected ';', ',' or ')'
>  before string constant
>  drivers/net/wan/ixp4xx_hss.c:1414:21: error: expected ';', ',' or ')'
>  before string constant
>  drivers/net/wan/ixp4xx_hss.c:1415:19: error: expected ';', ',' or ')'
>  before string constant
>  make[8]: *** [drivers/net/wan/ixp4xx_hss.o] Error 1
> 
> CC: stable@vger.kernel.org
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
> [stable: 3.1+]

The versions to receive stable updates should be noted on the inline Cc
line, not in non-committed comments.  (But David prefers to collect up
networking patches in his own stable queue rather than using the inline
Cc mechanism.  So the Cc may not be appropriate at all.)

Ben.

>  drivers/net/wan/ixp4xx_hss.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
> index aaaca9a..3f575af 100644
> --- a/drivers/net/wan/ixp4xx_hss.c
> +++ b/drivers/net/wan/ixp4xx_hss.c
> @@ -10,6 +10,7 @@
>  
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>  
> +#include <linux/module.h>
>  #include <linux/bitops.h>
>  #include <linux/cdev.h>
>  #include <linux/dma-mapping.h>

Patch

diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
index aaaca9a..3f575af 100644
--- a/drivers/net/wan/ixp4xx_hss.c
+++ b/drivers/net/wan/ixp4xx_hss.c
@@ -10,6 +10,7 @@ 
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/module.h>
 #include <linux/bitops.h>
 #include <linux/cdev.h>
 #include <linux/dma-mapping.h>