aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/board-flash.c2
-rw-r--r--arch/arm/mach-omap2/clkt_clksel.c2
-rw-r--r--arch/arm/mach-omap2/mux.c2
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_3xxx_data.c6
-rw-r--r--arch/arm/mach-omap2/pm-debug.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c
index 0cabe61cd507..e642acf9cad0 100644
--- a/arch/arm/mach-omap2/board-flash.c
+++ b/arch/arm/mach-omap2/board-flash.c
@@ -218,7 +218,7 @@ void __init board_flash_init(struct flash_partitions partition_info[],
218 if (onenandcs > GPMC_CS_NUM) 218 if (onenandcs > GPMC_CS_NUM)
219 onenandcs = cs; 219 onenandcs = cs;
220 break; 220 break;
221 }; 221 }
222 cs++; 222 cs++;
223 } 223 }
224 224
diff --git a/arch/arm/mach-omap2/clkt_clksel.c b/arch/arm/mach-omap2/clkt_clksel.c
index eaed3900a83c..3ff22114d702 100644
--- a/arch/arm/mach-omap2/clkt_clksel.c
+++ b/arch/arm/mach-omap2/clkt_clksel.c
@@ -382,7 +382,7 @@ void omap2_init_clksel_parent(struct clk *clk)
382 __clk_get_name(parent) : 382 __clk_get_name(parent) :
383 "NULL")); 383 "NULL"));
384 clk_reparent(clk, clks->parent); 384 clk_reparent(clk, clks->parent);
385 }; 385 }
386 found = 1; 386 found = 1;
387 } 387 }
388 } 388 }
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 9fe6829f4c16..701e17cba468 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -486,7 +486,7 @@ void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state)
486 default: 486 default:
487 /* Nothing to be done */ 487 /* Nothing to be done */
488 break; 488 break;
489 }; 489 }
490 490
491 if (val >= 0) { 491 if (val >= 0) {
492 omap_mux_write(pad->partition, val, 492 omap_mux_write(pad->partition, val,
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index cc1fad7f3e97..82fdb5932d31 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3738,7 +3738,7 @@ int __init omap3xxx_hwmod_init(void)
3738 } else { 3738 } else {
3739 WARN(1, "OMAP3 hwmod family init: unknown chip type\n"); 3739 WARN(1, "OMAP3 hwmod family init: unknown chip type\n");
3740 return -EINVAL; 3740 return -EINVAL;
3741 }; 3741 }
3742 3742
3743 r = omap_hwmod_register_links(h); 3743 r = omap_hwmod_register_links(h);
3744 if (r < 0) 3744 if (r < 0)
@@ -3755,7 +3755,7 @@ int __init omap3xxx_hwmod_init(void)
3755 rev == OMAP3430_REV_ES3_0 || rev == OMAP3430_REV_ES3_1 || 3755 rev == OMAP3430_REV_ES3_0 || rev == OMAP3430_REV_ES3_1 ||
3756 rev == OMAP3430_REV_ES3_1_2) { 3756 rev == OMAP3430_REV_ES3_1_2) {
3757 h = omap3430es2plus_hwmod_ocp_ifs; 3757 h = omap3430es2plus_hwmod_ocp_ifs;
3758 }; 3758 }
3759 3759
3760 if (h) { 3760 if (h) {
3761 r = omap_hwmod_register_links(h); 3761 r = omap_hwmod_register_links(h);
@@ -3770,7 +3770,7 @@ int __init omap3xxx_hwmod_init(void)
3770 } else if (rev == OMAP3430_REV_ES3_0 || rev == OMAP3430_REV_ES3_1 || 3770 } else if (rev == OMAP3430_REV_ES3_0 || rev == OMAP3430_REV_ES3_1 ||
3771 rev == OMAP3430_REV_ES3_1_2) { 3771 rev == OMAP3430_REV_ES3_1_2) {
3772 h = omap3430_es3plus_hwmod_ocp_ifs; 3772 h = omap3430_es3plus_hwmod_ocp_ifs;
3773 }; 3773 }
3774 3774
3775 if (h) 3775 if (h)
3776 r = omap_hwmod_register_links(h); 3776 r = omap_hwmod_register_links(h);
diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index 3e1345fc0713..46092cd806fa 100644
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -168,7 +168,7 @@ static int pm_dbg_open(struct inode *inode, struct file *file)
168 default: 168 default:
169 return single_open(file, pm_dbg_show_timers, 169 return single_open(file, pm_dbg_show_timers,
170 &inode->i_private); 170 &inode->i_private);
171 }; 171 }
172} 172}
173 173
174static const struct file_operations debug_fops = { 174static const struct file_operations debug_fops = {