omap2 clock: From: Paul Walmsley <paul@pwsan.com> Subject:

Clean up omap2_clk_set_parent() by bailing out early if the clock is not
parent-selectable.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

arch/arm/mach-omap2/clock.c

@@ -913,18 +913,20 @@ static u32 omap2_get_src_field(u32 *type_to_addr, u32 reg_offset,
 static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
 {
 	void __iomem * reg;
-	u32 src_sel, src_off, field_val, field_mask, reg_val, rate;
+	u32 src_sel, src_off, field_val, field_mask, reg_val;
 	int ret = -EINVAL;
 
 	if (unlikely(clk->flags & CONFIG_PARTICIPANT))
 		return ret;
 
-	if (clk->flags & SRC_SEL_MASK) {	/* On-chip SEL collection */
+	if (unlikely(!(clk->flags & SRC_SEL_MASK)))
+		return ret;
+
 	src_sel = (SRC_RATE_SEL_MASK & clk->flags);
 	src_off = clk->src_offset;
 
 	if (src_sel == 0)
-			goto set_parent_error;
+		return ret;
 
 	field_val = omap2_get_src_field(&src_sel, src_off, new_parent,
 					&field_mask);
@@ -961,15 +963,6 @@ static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
 		propagate_rate(clk);
 
 	return 0;
-	} else {
-		clk->parent = new_parent;
-		rate = new_parent->rate;
-		omap2_clk_set_rate(clk, rate);
-		ret = 0;
-	}
-
- set_parent_error:
-	return ret;
 }
 
 /* Sets basic clocks based on the specified rate */