From: Kirill A. Shutemov on
On Wed, Jun 30, 2010 at 05:54:42PM +0200, Christoph Egger wrote:
> OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
> references for it from the source code.

IIUC, CONFIG_OMAP_MUX_WARNINGS should be used here instead of it.

> Signed-off-by: Christoph Egger <siccegge(a)cs.fau.de>
> ---
> arch/arm/mach-omap1/mux.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
> index 8434137..1ddb02c 100644
> --- a/arch/arm/mach-omap1/mux.c
> +++ b/arch/arm/mach-omap1/mux.c
> @@ -439,12 +439,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
> cfg->pull_name, cfg->pull_reg, pull_orig, pull);
> }
> #endif
> -
> -#ifdef CONFIG_OMAP_MUX_ERRORS
> - return warn ? -ETXTBSY : 0;
> -#else
> return 0;
> -#endif
> }
>
> int __init omap1_mux_init(void)
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel(a)lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

--
Kirill A. Shutemov
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Christoph Egger on
On Wed, Jun 30, 2010 at 10:54:09PM +0300, Kirill A. Shutemov wrote:
> On Wed, Jun 30, 2010 at 05:54:42PM +0200, Christoph Egger wrote:
> > OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
>
> IIUC, CONFIG_OMAP_MUX_WARNINGS should be used here instead of it.

Something like the patch below?

----
From: Christoph Egger <siccegge(a)cs.fau.de>
Date: Wed, 30 Jun 2010 12:30:36 +0200
Subject: [PATCH 03/33] Replace dead OMAP_MUX_ERRORS with OMAP_MUX_WARNINGS

OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore replacing all
references for it with OMAP_MUX_WARNINGS in the source code.

Signed-off-by: Christoph Egger <siccegge(a)cs.fau.de>
---
arch/arm/mach-omap1/mux.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
index 8434137..3e98835 100644
--- a/arch/arm/mach-omap1/mux.c
+++ b/arch/arm/mach-omap1/mux.c
@@ -440,7 +440,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
}
#endif

-#ifdef CONFIG_OMAP_MUX_ERRORS
+#ifdef CONFIG_OMAP_MUX_WARNINGS
return warn ? -ETXTBSY : 0;
#else
return 0;
--
1.7.0.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Kirill A. Shutemov on
On Thu, Jul 01, 2010 at 03:22:55PM +0200, Christoph Egger wrote:
> On Wed, Jun 30, 2010 at 10:54:09PM +0300, Kirill A. Shutemov wrote:
> > On Wed, Jun 30, 2010 at 05:54:42PM +0200, Christoph Egger wrote:
> > > OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
> > > references for it from the source code.
> >
> > IIUC, CONFIG_OMAP_MUX_WARNINGS should be used here instead of it.
>
> Something like the patch below?

Acked-by: Kirill A. Shutemov <kirill(a)shutemov.name>

>
> ----
> From: Christoph Egger <siccegge(a)cs.fau.de>
> Date: Wed, 30 Jun 2010 12:30:36 +0200
> Subject: [PATCH 03/33] Replace dead OMAP_MUX_ERRORS with OMAP_MUX_WARNINGS
>
> OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore replacing all
> references for it with OMAP_MUX_WARNINGS in the source code.
>
> Signed-off-by: Christoph Egger <siccegge(a)cs.fau.de>
> ---
> arch/arm/mach-omap1/mux.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
> index 8434137..3e98835 100644
> --- a/arch/arm/mach-omap1/mux.c
> +++ b/arch/arm/mach-omap1/mux.c
> @@ -440,7 +440,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
> }
> #endif
>
> -#ifdef CONFIG_OMAP_MUX_ERRORS
> +#ifdef CONFIG_OMAP_MUX_WARNINGS
> return warn ? -ETXTBSY : 0;
> #else
> return 0;
> --
> 1.7.0.4
>
>

--
Kirill A. Shutemov
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Tony Lindgren on
* Kirill A. Shutemov <kirill(a)shutemov.name> [100701 18:21]:
> On Thu, Jul 01, 2010 at 03:22:55PM +0200, Christoph Egger wrote:
> > On Wed, Jun 30, 2010 at 10:54:09PM +0300, Kirill A. Shutemov wrote:
> > > On Wed, Jun 30, 2010 at 05:54:42PM +0200, Christoph Egger wrote:
> > > > OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
> > > > references for it from the source code.
> > >
> > > IIUC, CONFIG_OMAP_MUX_WARNINGS should be used here instead of it.
> >
> > Something like the patch below?
>
> Acked-by: Kirill A. Shutemov <kirill(a)shutemov.name>

Thanks, I've queued up this.

Tony

> >
> > ----
> > From: Christoph Egger <siccegge(a)cs.fau.de>
> > Date: Wed, 30 Jun 2010 12:30:36 +0200
> > Subject: [PATCH 03/33] Replace dead OMAP_MUX_ERRORS with OMAP_MUX_WARNINGS
> >
> > OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore replacing all
> > references for it with OMAP_MUX_WARNINGS in the source code.
> >
> > Signed-off-by: Christoph Egger <siccegge(a)cs.fau.de>
> > ---
> > arch/arm/mach-omap1/mux.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
> > index 8434137..3e98835 100644
> > --- a/arch/arm/mach-omap1/mux.c
> > +++ b/arch/arm/mach-omap1/mux.c
> > @@ -440,7 +440,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
> > }
> > #endif
> >
> > -#ifdef CONFIG_OMAP_MUX_ERRORS
> > +#ifdef CONFIG_OMAP_MUX_WARNINGS
> > return warn ? -ETXTBSY : 0;
> > #else
> > return 0;
> > --
> > 1.7.0.4
> >
> >
>
> --
> Kirill A. Shutemov
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/