ARM: at91/setup: fix trivial typos
PATCH 1/2 ARM: at91/setup: fix trivial typos
Fix a few trivial typos in panic, warning and debug messages.
Signed-off-by Johan Hovold <[email protected]>
--- arch/arm/mach-at91/setup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-at91/setup.c +4 -4
@@ -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 ; }
Signature · 1 line
1.8.1.5
PATCH 2/2 ARM: at91: remove trailing semicolon from macros
Remove trailing semicolon from register-access macros.
Signed-off-by Johan Hovold <[email protected]>
--- 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(-)
arch/arm/mach-at91/at91_rstc.h +1 -1
@@ -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
arch/arm/mach-at91/at91_shdwc.h +1 -1
@@ -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 */
arch/arm/mach-at91/at91x40_time.c +1 -1
@@ -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.
arch/arm/mach-at91/include/mach/at91_matrix.h +1 -1
@@ -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
arch/arm/mach-at91/include/mach/at91_st.h +1 -1
@@ -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
Signature · 1 line
1.8.1.5
Re: [PATCH 2/2] ARM: at91: remove trailing semicolon from macros
On 04/07/2013 04:49 PM, Johan Hovold :
Quoted 3 lines
Remove trailing semicolon from register-access macros.
Signed-off-by Johan Hovold <[email protected]>
Acked-by Nicolas Ferre <[email protected]>
Now in at91-3.10-cleanup. Thanks,
Quoted 74 lines
--- 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(-)arch/arm/mach-at91/at91_rstc.h +1
-1@@ -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 arch/arm/mach-at91/at91_shdwc.h +1
-1@@ -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 */ arch/arm/mach-at91/at91x40_time.c +1
-1@@ -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. arch/arm/mach-at91/include/mach/at91_matrix.h +1
-1@@ -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_basearch/arm/mach-at91/include/mach/at91_st.h +1
-1@@ -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
Signature · 1 line
Nicolas Ferre
On 04/07/2013 04:49 PM, Johan Hovold :
Quoted 3 lines
Fix a few trivial typos in panic, warning and debug messages.
Signed-off-by Johan Hovold <[email protected]>
Acked-by Nicolas Ferre <[email protected]>
Quoted 9 lines
--- arch/arm/mach-at91/setup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/arm/mach-at91/setup.c +0
-0
arch/arm/mach-at91/setup.c static void at91_dt_rstc(void) · line 336
Quoted 5 lines
arch/arm/mach-at91/setup.c +1
-1@@ -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.
Quoted 22 lines
arch/arm/mach-at91/setup.c +2
-2arm_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 ; }
arch/arm/mach-at91/setup.c static void at91_dt_shdwc(void) · line 425
Quoted 8 lines
arch/arm/mach-at91/setup.c +1
-1@@ -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,
Signature · 1 line
Nicolas Ferre