summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-atmel.c
diff options
context:
space:
mode:
authorFengguang Wu <fengguang.wu@intel.com>2014-10-17 00:18:56 +0800
committerMark Brown <broonie@kernel.org>2014-10-20 12:24:18 +0100
commitd0de6ff6b92665c10a93795e9d041a61f64431af (patch)
tree1d93e85fbe2044ae7d9095911cdfb51f666a640c /drivers/spi/spi-atmel.c
parentce0c4caf256cb828e0465d3cd363ec145e446e21 (diff)
downloadlinux-d0de6ff6b92665c10a93795e9d041a61f64431af.tar.gz
linux-d0de6ff6b92665c10a93795e9d041a61f64431af.tar.bz2
linux-d0de6ff6b92665c10a93795e9d041a61f64431af.zip
spi/atmel: fix simple_return.cocci warnings
drivers/spi/spi-atmel.c:1518:1-4: WARNING: end returns can be simpified and declaration on line 1514 can be dropped Simplify a trivial if-return sequence. Possibly combine with a preceding function call. Generated by: scripts/coccinelle/misc/simple_return.cocci Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-atmel.c')
-rw-r--r--drivers/spi/spi-atmel.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index bc9d96902837..3f500142f13c 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1511,15 +1511,10 @@ static int atmel_spi_runtime_resume(struct device *dev)
{
struct spi_master *master = dev_get_drvdata(dev);
struct atmel_spi *as = spi_master_get_devdata(master);
- int ret;
pinctrl_pm_select_default_state(dev);
- ret = clk_prepare_enable(as->clk);
- if (ret)
- return ret;
-
- return 0;
+ return clk_prepare_enable(as->clk);
}
#endif