summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorCatalina Mocanu <catalina.mocanu@gmail.com>2014-09-24 14:27:36 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-28 22:08:13 -0400
commit7557b6e17215623f9e887e3815d447bb4dc4083f (patch)
treed7cdb0592311123e2936cd3cee9b9838ecd015f4 /drivers/staging
parent8684ba72fa39c424ab788364992f377ef2d96676 (diff)
downloadblackbird-op-linux-7557b6e17215623f9e887e3815d447bb4dc4083f.tar.gz
blackbird-op-linux-7557b6e17215623f9e887e3815d447bb4dc4083f.zip
staging: imx-drm: Don't put an else right after a return
This fixes the following checkpatch.pl warning: WARNING: else is not generally useful after a break or return. Signed-off-by: Catalina Mocanu <catalina.mocanu@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/imx-drm/imx-hdmi.c3
-rw-r--r--drivers/staging/imx-drm/imx-tve.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
index 18c9ccd460b7..aaec6b2cdf56 100644
--- a/drivers/staging/imx-drm/imx-hdmi.c
+++ b/drivers/staging/imx-drm/imx-hdmi.c
@@ -323,8 +323,7 @@ static unsigned int hdmi_compute_cts(unsigned int freq, unsigned long pixel_clk,
}
if (ratio == 100)
return cts;
- else
- return (cts * ratio) / 100;
+ return (cts * ratio) / 100;
}
static void hdmi_set_clk_regenerator(struct imx_hdmi *hdmi,
diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c
index fa8f827a47fc..42c651be6c20 100644
--- a/drivers/staging/imx-drm/imx-tve.c
+++ b/drivers/staging/imx-drm/imx-tve.c
@@ -432,8 +432,7 @@ static long clk_tve_di_round_rate(struct clk_hw *hw, unsigned long rate,
return *prate / 4;
else if (div >= 2)
return *prate / 2;
- else
- return *prate;
+ return *prate;
}
static int clk_tve_di_set_rate(struct clk_hw *hw, unsigned long rate,
OpenPOWER on IntegriCloud