Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here
Caused by commit 926341250102 ("memstick: add driver for Ricoh R5C592
card reader").
enable_dma() is also defined in a few other architectures including x86
(presumably asm/dma.h does not get included there).
I just reverted that commit for today.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Mon, 28 Mar 2011 14:44:58 +1100 Stephen Rothwell <[email protected]> wrote:
>
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
> arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here
>
> Caused by commit 926341250102 ("memstick: add driver for Ricoh R5C592
> card reader").
>
> enable_dma() is also defined in a few other architectures including x86
> (presumably asm/dma.h does not get included there).
>
> I just reverted that commit for today.
I will, instead, apply this patch for today:
From: Stephen Rothwell <[email protected]>
Date: Tue, 29 Mar 2011 09:12:53 +1100
Subject: [PATCH] memstick: make enable_dma less generic in r592
Fixes this build error:
drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here
Signed-off-by: Stephen Rothwell <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: FUJITA Tomonori <[email protected]>
Cc: Alex Dubov <[email protected]>
Cc: Maxim Levitsky <[email protected]>
---
drivers/memstick/host/r592.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 767406c..ecf3d7d 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -23,7 +23,7 @@
#include <linux/swab.h>
#include "r592.h"
-static int enable_dma = 1;
+static int r592_enable_dma = 1;
static int debug;
static const char *tpc_names[] = {
@@ -267,7 +267,7 @@ static void r592_stop_dma(struct r592_device *dev, int error)
/* Test if hardware supports DMA */
static void r592_check_dma(struct r592_device *dev)
{
- dev->dma_capable = enable_dma &&
+ dev->dma_capable = r592_enable_dma &&
(r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) &
R592_FIFO_DMA_SETTINGS_CAP);
}
@@ -898,7 +898,7 @@ static void __exit r592_module_exit(void)
module_init(r592_module_init);
module_exit(r592_module_exit);
-module_param(enable_dma, bool, S_IRUGO);
+module_param_named(r592_enable_dma, enable_dma, bool, S_IRUGO);
MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)");
module_param(debug, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug level (0-3)");
--
1.7.4.1
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
Hi all,
ignore this ... I will send a fixed version soon, sorry
On Tue, 29 Mar 2011 09:24:16 +1100 Stephen Rothwell <[email protected]> wrote:
>
> On Mon, 28 Mar 2011 14:44:58 +1100 Stephen Rothwell <[email protected]> wrote:
> >
> > Hi all,
> >
> > After merging the final tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
> > arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here
> >
> > Caused by commit 926341250102 ("memstick: add driver for Ricoh R5C592
> > card reader").
> >
> > enable_dma() is also defined in a few other architectures including x86
> > (presumably asm/dma.h does not get included there).
> >
> > I just reverted that commit for today.
>
> I will, instead, apply this patch for today:
>
> From: Stephen Rothwell <[email protected]>
> Date: Tue, 29 Mar 2011 09:12:53 +1100
> Subject: [PATCH] memstick: make enable_dma less generic in r592
>
> Fixes this build error:
>
> drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
> arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Cc: FUJITA Tomonori <[email protected]>
> Cc: Alex Dubov <[email protected]>
> Cc: Maxim Levitsky <[email protected]>
> ---
> drivers/memstick/host/r592.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
> index 767406c..ecf3d7d 100644
> --- a/drivers/memstick/host/r592.c
> +++ b/drivers/memstick/host/r592.c
> @@ -23,7 +23,7 @@
> #include <linux/swab.h>
> #include "r592.h"
>
> -static int enable_dma = 1;
> +static int r592_enable_dma = 1;
> static int debug;
>
> static const char *tpc_names[] = {
> @@ -267,7 +267,7 @@ static void r592_stop_dma(struct r592_device *dev, int error)
> /* Test if hardware supports DMA */
> static void r592_check_dma(struct r592_device *dev)
> {
> - dev->dma_capable = enable_dma &&
> + dev->dma_capable = r592_enable_dma &&
> (r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) &
> R592_FIFO_DMA_SETTINGS_CAP);
> }
> @@ -898,7 +898,7 @@ static void __exit r592_module_exit(void)
> module_init(r592_module_init);
> module_exit(r592_module_exit);
>
> -module_param(enable_dma, bool, S_IRUGO);
> +module_param_named(r592_enable_dma, enable_dma, bool, S_IRUGO);
> MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)");
> module_param(debug, int, S_IRUGO | S_IWUSR);
> MODULE_PARM_DESC(debug, "Debug level (0-3)");
> --
> 1.7.4.1
>
>
> --
> Cheers,
> Stephen Rothwell [email protected]
> http://www.canb.auug.org.au/~sfr/
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
Fixes this build error:
drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here
Signed-off-by: Stephen Rothwell <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: FUJITA Tomonori <[email protected]>
Cc: Alex Dubov <[email protected]>
Cc: Maxim Levitsky <[email protected]>
---
drivers/memstick/host/r592.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
v2: get the arguments to module_param_named() in the right order (blush :-))
This has been applied to linux-next today.
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 767406c..700d420 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -23,7 +23,7 @@
#include <linux/swab.h>
#include "r592.h"
-static int enable_dma = 1;
+static int r592_enable_dma = 1;
static int debug;
static const char *tpc_names[] = {
@@ -267,7 +267,7 @@ static void r592_stop_dma(struct r592_device *dev, int error)
/* Test if hardware supports DMA */
static void r592_check_dma(struct r592_device *dev)
{
- dev->dma_capable = enable_dma &&
+ dev->dma_capable = r592_enable_dma &&
(r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) &
R592_FIFO_DMA_SETTINGS_CAP);
}
@@ -898,7 +898,7 @@ static void __exit r592_module_exit(void)
module_init(r592_module_init);
module_exit(r592_module_exit);
-module_param(enable_dma, bool, S_IRUGO);
+module_param_named(enable_dma, r592_enable_dma, bool, S_IRUGO);
MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)");
module_param(debug, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug level (0-3)");
--
1.7.4.1
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Tue, 2011-03-29 at 10:10 +1100, Stephen Rothwell wrote:
> Fixes this build error:
>
> drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
> arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Cc: FUJITA Tomonori <[email protected]>
> Cc: Alex Dubov <[email protected]>
> Cc: Maxim Levitsky <[email protected]>
> ---
> drivers/memstick/host/r592.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> v2: get the arguments to module_param_named() in the right order (blush :-))
>
> This has been applied to linux-next today.
>
> diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
> index 767406c..700d420 100644
> --- a/drivers/memstick/host/r592.c
> +++ b/drivers/memstick/host/r592.c
> @@ -23,7 +23,7 @@
> #include <linux/swab.h>
> #include "r592.h"
>
> -static int enable_dma = 1;
> +static int r592_enable_dma = 1;
> static int debug;
>
> static const char *tpc_names[] = {
> @@ -267,7 +267,7 @@ static void r592_stop_dma(struct r592_device *dev, int error)
> /* Test if hardware supports DMA */
> static void r592_check_dma(struct r592_device *dev)
> {
> - dev->dma_capable = enable_dma &&
> + dev->dma_capable = r592_enable_dma &&
> (r592_read_reg(dev, R592_FIFO_DMA_SETTINGS) &
> R592_FIFO_DMA_SETTINGS_CAP);
> }
> @@ -898,7 +898,7 @@ static void __exit r592_module_exit(void)
> module_init(r592_module_init);
> module_exit(r592_module_exit);
>
> -module_param(enable_dma, bool, S_IRUGO);
> +module_param_named(enable_dma, r592_enable_dma, bool, S_IRUGO);
> MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)");
> module_param(debug, int, S_IRUGO | S_IWUSR);
> MODULE_PARM_DESC(debug, "Debug level (0-3)");
> --
> 1.7.4.1
>
Sorry for this name clash. I didn't expect it.
Thanks for spotting this.
--
Best regards,
Maxim Levitsky
Visit my blog: http://maximlevitsky.wordpress.com
Warning: Above blog contains rants.