* [PATCH 1/2] ARM: at91/setup: fix trivial typos
@ 2013-04-07 14:49 Johan Hovold
2013-04-07 14:49 ` [PATCH 2/2] ARM: at91: remove trailing semicolon from macros Johan Hovold
2013-04-08 15:47 ` [PATCH 1/2] ARM: at91/setup: fix trivial typos Nicolas Ferre
0 siblings, 2 replies; 4+ messages in thread
From: Johan Hovold @ 2013-04-07 14:49 UTC (permalink / raw)
To: linux-arm-kernel
Fix a few trivial typos in panic, warning and debug messages.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
arch/arm/mach-at91/setup.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index 4b67847..9e7c1e1 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -333,7 +333,7 @@ static void at91_dt_rstc(void)
of_id = of_match_node(rstc_ids, np);
if (!of_id)
- panic("AT91: rtsc no restart function availlable\n");
+ panic("AT91: rtsc no restart function available\n");
arm_pm_restart = of_id->data;
@@ -353,7 +353,7 @@ static void at91_dt_ramc(void)
np = of_find_matching_node(NULL, ramc_ids);
if (!np)
- panic("unable to find compatible ram conroller node in dtb\n");
+ panic("unable to find compatible ram controller node in dtb\n");
at91_ramc_base[0] = of_iomap(np, 0);
if (!at91_ramc_base[0])
@@ -403,7 +403,7 @@ static void at91_dt_shdwc(void)
np = of_find_matching_node(NULL, shdwc_ids);
if (!np) {
- pr_debug("AT91: unable to find compatible shutdown (shdwc) conroller node in dtb\n");
+ pr_debug("AT91: unable to find compatible shutdown (shdwc) controller node in dtb\n");
return;
}
@@ -419,7 +419,7 @@ static void at91_dt_shdwc(void)
if (!of_property_read_u32(np, "atmel,wakeup-counter", ®)) {
if (reg > AT91_SHDW_CPTWK0_MAX) {
- pr_warn("AT91: shdwc wakeup conter 0x%x > 0x%x reduce it to 0x%x\n",
+ pr_warn("AT91: shdwc wakeup counter 0x%x > 0x%x reduce it to 0x%x\n",
reg, AT91_SHDW_CPTWK0_MAX, AT91_SHDW_CPTWK0_MAX);
reg = AT91_SHDW_CPTWK0_MAX;
}
--
1.8.1.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] ARM: at91: remove trailing semicolon from macros
2013-04-07 14:49 [PATCH 1/2] ARM: at91/setup: fix trivial typos Johan Hovold
@ 2013-04-07 14:49 ` Johan Hovold
2013-04-08 15:49 ` Nicolas Ferre
2013-04-08 15:47 ` [PATCH 1/2] ARM: at91/setup: fix trivial typos Nicolas Ferre
1 sibling, 1 reply; 4+ messages in thread
From: Johan Hovold @ 2013-04-07 14:49 UTC (permalink / raw)
To: linux-arm-kernel
Remove trailing semicolon from register-access macros.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
arch/arm/mach-at91/at91_rstc.h | 2 +-
arch/arm/mach-at91/at91_shdwc.h | 2 +-
arch/arm/mach-at91/at91x40_time.c | 2 +-
arch/arm/mach-at91/include/mach/at91_matrix.h | 2 +-
arch/arm/mach-at91/include/mach/at91_st.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-at91/at91_rstc.h b/arch/arm/mach-at91/at91_rstc.h
index 875fa33..a600e69 100644
--- a/arch/arm/mach-at91/at91_rstc.h
+++ b/arch/arm/mach-at91/at91_rstc.h
@@ -23,7 +23,7 @@ extern void __iomem *at91_rstc_base;
__raw_readl(at91_rstc_base + field)
#define at91_rstc_write(field, value) \
- __raw_writel(value, at91_rstc_base + field);
+ __raw_writel(value, at91_rstc_base + field)
#else
.extern at91_rstc_base
#endif
diff --git a/arch/arm/mach-at91/at91_shdwc.h b/arch/arm/mach-at91/at91_shdwc.h
index 60478ea..9e29f31 100644
--- a/arch/arm/mach-at91/at91_shdwc.h
+++ b/arch/arm/mach-at91/at91_shdwc.h
@@ -23,7 +23,7 @@ extern void __iomem *at91_shdwc_base;
__raw_readl(at91_shdwc_base + field)
#define at91_shdwc_write(field, value) \
- __raw_writel(value, at91_shdwc_base + field);
+ __raw_writel(value, at91_shdwc_base + field)
#endif
#define AT91_SHDW_CR 0x00 /* Shut Down Control Register */
diff --git a/arch/arm/mach-at91/at91x40_time.c b/arch/arm/mach-at91/at91x40_time.c
index 0e57e44..f4c81c2 100644
--- a/arch/arm/mach-at91/at91x40_time.c
+++ b/arch/arm/mach-at91/at91x40_time.c
@@ -33,7 +33,7 @@
__raw_readl(AT91_IO_P2V(AT91_TC) + field)
#define at91_tc_write(field, value) \
- __raw_writel(value, AT91_IO_P2V(AT91_TC) + field);
+ __raw_writel(value, AT91_IO_P2V(AT91_TC) + field)
/*
* 3 counter/timer units present.
diff --git a/arch/arm/mach-at91/include/mach/at91_matrix.h b/arch/arm/mach-at91/include/mach/at91_matrix.h
index 02fae9d..f8996c9 100644
--- a/arch/arm/mach-at91/include/mach/at91_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91_matrix.h
@@ -14,7 +14,7 @@ extern void __iomem *at91_matrix_base;
__raw_readl(at91_matrix_base + field)
#define at91_matrix_write(field, value) \
- __raw_writel(value, at91_matrix_base + field);
+ __raw_writel(value, at91_matrix_base + field)
#else
.extern at91_matrix_base
diff --git a/arch/arm/mach-at91/include/mach/at91_st.h b/arch/arm/mach-at91/include/mach/at91_st.h
index 969aac2..67fdbd1 100644
--- a/arch/arm/mach-at91/include/mach/at91_st.h
+++ b/arch/arm/mach-at91/include/mach/at91_st.h
@@ -23,7 +23,7 @@ extern void __iomem *at91_st_base;
__raw_readl(at91_st_base + field)
#define at91_st_write(field, value) \
- __raw_writel(value, at91_st_base + field);
+ __raw_writel(value, at91_st_base + field)
#else
.extern at91_st_base
#endif
--
1.8.1.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: at91: remove trailing semicolon from macros
2013-04-07 14:49 ` [PATCH 2/2] ARM: at91: remove trailing semicolon from macros Johan Hovold
@ 2013-04-08 15:49 ` Nicolas Ferre
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2013-04-08 15:49 UTC (permalink / raw)
To: linux-arm-kernel
On 04/07/2013 04:49 PM, Johan Hovold :
> Remove trailing semicolon from register-access macros.
>
> Signed-off-by: Johan Hovold <jhovold@gmail.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Now in at91-3.10-cleanup. Thanks,
> ---
> arch/arm/mach-at91/at91_rstc.h | 2 +-
> arch/arm/mach-at91/at91_shdwc.h | 2 +-
> arch/arm/mach-at91/at91x40_time.c | 2 +-
> arch/arm/mach-at91/include/mach/at91_matrix.h | 2 +-
> arch/arm/mach-at91/include/mach/at91_st.h | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-at91/at91_rstc.h b/arch/arm/mach-at91/at91_rstc.h
> index 875fa33..a600e69 100644
> --- a/arch/arm/mach-at91/at91_rstc.h
> +++ b/arch/arm/mach-at91/at91_rstc.h
> @@ -23,7 +23,7 @@ extern void __iomem *at91_rstc_base;
> __raw_readl(at91_rstc_base + field)
>
> #define at91_rstc_write(field, value) \
> - __raw_writel(value, at91_rstc_base + field);
> + __raw_writel(value, at91_rstc_base + field)
> #else
> .extern at91_rstc_base
> #endif
> diff --git a/arch/arm/mach-at91/at91_shdwc.h b/arch/arm/mach-at91/at91_shdwc.h
> index 60478ea..9e29f31 100644
> --- a/arch/arm/mach-at91/at91_shdwc.h
> +++ b/arch/arm/mach-at91/at91_shdwc.h
> @@ -23,7 +23,7 @@ extern void __iomem *at91_shdwc_base;
> __raw_readl(at91_shdwc_base + field)
>
> #define at91_shdwc_write(field, value) \
> - __raw_writel(value, at91_shdwc_base + field);
> + __raw_writel(value, at91_shdwc_base + field)
> #endif
>
> #define AT91_SHDW_CR 0x00 /* Shut Down Control Register */
> diff --git a/arch/arm/mach-at91/at91x40_time.c b/arch/arm/mach-at91/at91x40_time.c
> index 0e57e44..f4c81c2 100644
> --- a/arch/arm/mach-at91/at91x40_time.c
> +++ b/arch/arm/mach-at91/at91x40_time.c
> @@ -33,7 +33,7 @@
> __raw_readl(AT91_IO_P2V(AT91_TC) + field)
>
> #define at91_tc_write(field, value) \
> - __raw_writel(value, AT91_IO_P2V(AT91_TC) + field);
> + __raw_writel(value, AT91_IO_P2V(AT91_TC) + field)
>
> /*
> * 3 counter/timer units present.
> diff --git a/arch/arm/mach-at91/include/mach/at91_matrix.h b/arch/arm/mach-at91/include/mach/at91_matrix.h
> index 02fae9d..f8996c9 100644
> --- a/arch/arm/mach-at91/include/mach/at91_matrix.h
> +++ b/arch/arm/mach-at91/include/mach/at91_matrix.h
> @@ -14,7 +14,7 @@ extern void __iomem *at91_matrix_base;
> __raw_readl(at91_matrix_base + field)
>
> #define at91_matrix_write(field, value) \
> - __raw_writel(value, at91_matrix_base + field);
> + __raw_writel(value, at91_matrix_base + field)
>
> #else
> .extern at91_matrix_base
> diff --git a/arch/arm/mach-at91/include/mach/at91_st.h b/arch/arm/mach-at91/include/mach/at91_st.h
> index 969aac2..67fdbd1 100644
> --- a/arch/arm/mach-at91/include/mach/at91_st.h
> +++ b/arch/arm/mach-at91/include/mach/at91_st.h
> @@ -23,7 +23,7 @@ extern void __iomem *at91_st_base;
> __raw_readl(at91_st_base + field)
>
> #define at91_st_write(field, value) \
> - __raw_writel(value, at91_st_base + field);
> + __raw_writel(value, at91_st_base + field)
> #else
> .extern at91_st_base
> #endif
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] ARM: at91/setup: fix trivial typos
2013-04-07 14:49 [PATCH 1/2] ARM: at91/setup: fix trivial typos Johan Hovold
2013-04-07 14:49 ` [PATCH 2/2] ARM: at91: remove trailing semicolon from macros Johan Hovold
@ 2013-04-08 15:47 ` Nicolas Ferre
1 sibling, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2013-04-08 15:47 UTC (permalink / raw)
To: linux-arm-kernel
On 04/07/2013 04:49 PM, Johan Hovold :
> Fix a few trivial typos in panic, warning and debug messages.
>
> Signed-off-by: Johan Hovold <jhovold@gmail.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> arch/arm/mach-at91/setup.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
> index 4b67847..9e7c1e1 100644
> --- a/arch/arm/mach-at91/setup.c
> +++ b/arch/arm/mach-at91/setup.c
> @@ -333,7 +333,7 @@ static void at91_dt_rstc(void)
>
> of_id = of_match_node(rstc_ids, np);
> if (!of_id)
> - panic("AT91: rtsc no restart function availlable\n");
> + panic("AT91: rtsc no restart function available\n");
This one is stacked up.
>
> arm_pm_restart = of_id->data;
>
> @@ -353,7 +353,7 @@ static void at91_dt_ramc(void)
>
> np = of_find_matching_node(NULL, ramc_ids);
> if (!np)
> - panic("unable to find compatible ram conroller node in dtb\n");
> + panic("unable to find compatible ram controller node in dtb\n");
>
> at91_ramc_base[0] = of_iomap(np, 0);
> if (!at91_ramc_base[0])
> @@ -403,7 +403,7 @@ static void at91_dt_shdwc(void)
>
> np = of_find_matching_node(NULL, shdwc_ids);
> if (!np) {
> - pr_debug("AT91: unable to find compatible shutdown (shdwc) conroller node in dtb\n");
> + pr_debug("AT91: unable to find compatible shutdown (shdwc) controller node in dtb\n");
> return;
> }
>
> @@ -419,7 +419,7 @@ static void at91_dt_shdwc(void)
>
> if (!of_property_read_u32(np, "atmel,wakeup-counter", ®)) {
> if (reg > AT91_SHDW_CPTWK0_MAX) {
> - pr_warn("AT91: shdwc wakeup conter 0x%x > 0x%x reduce it to 0x%x\n",
> + pr_warn("AT91: shdwc wakeup counter 0x%x > 0x%x reduce it to 0x%x\n",
> reg, AT91_SHDW_CPTWK0_MAX, AT91_SHDW_CPTWK0_MAX);
> reg = AT91_SHDW_CPTWK0_MAX;
> }
The remaining bytes are now included in at91-3.10-cleanup branch.
Thanks,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-04-08 15:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-07 14:49 [PATCH 1/2] ARM: at91/setup: fix trivial typos Johan Hovold
2013-04-07 14:49 ` [PATCH 2/2] ARM: at91: remove trailing semicolon from macros Johan Hovold
2013-04-08 15:49 ` Nicolas Ferre
2013-04-08 15:47 ` [PATCH 1/2] ARM: at91/setup: fix trivial typos Nicolas Ferre
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).