Skip to content

Commit

Permalink
spi: rockchip: Slightly rework return value handling
Browse files Browse the repository at this point in the history
Slightly rework return value handling, no functional changes.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Jeffy Chen authored and Mark Brown committed Aug 7, 2017
1 parent 5771a8c commit 43de979
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions drivers/spi/spi-rockchip.c
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ static bool rockchip_spi_can_dma(struct spi_master *master,

static int rockchip_spi_probe(struct platform_device *pdev)
{
int ret = 0;
int ret;
struct rockchip_spi *rs;
struct spi_master *master;
struct resource *mem;
Expand Down Expand Up @@ -703,13 +703,13 @@ static int rockchip_spi_probe(struct platform_device *pdev)
}

ret = clk_prepare_enable(rs->apb_pclk);
if (ret) {
if (ret < 0) {
dev_err(&pdev->dev, "Failed to enable apb_pclk\n");
goto err_put_master;
}

ret = clk_prepare_enable(rs->spiclk);
if (ret) {
if (ret < 0) {
dev_err(&pdev->dev, "Failed to enable spi_clk\n");
goto err_disable_apbclk;
}
Expand Down Expand Up @@ -786,7 +786,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
}

ret = devm_spi_register_master(&pdev->dev, master);
if (ret) {
if (ret < 0) {
dev_err(&pdev->dev, "Failed to register master\n");
goto err_free_dma_rx;
}
Expand Down Expand Up @@ -834,12 +834,12 @@ static int rockchip_spi_remove(struct platform_device *pdev)
#ifdef CONFIG_PM_SLEEP
static int rockchip_spi_suspend(struct device *dev)
{
int ret = 0;
int ret;
struct spi_master *master = dev_get_drvdata(dev);
struct rockchip_spi *rs = spi_master_get_devdata(master);

ret = spi_master_suspend(rs->master);
if (ret)
if (ret < 0)
return ret;

if (!pm_runtime_suspended(dev)) {
Expand All @@ -849,12 +849,12 @@ static int rockchip_spi_suspend(struct device *dev)

pinctrl_pm_select_sleep_state(dev);

return ret;
return 0;
}

static int rockchip_spi_resume(struct device *dev)
{
int ret = 0;
int ret;
struct spi_master *master = dev_get_drvdata(dev);
struct rockchip_spi *rs = spi_master_get_devdata(master);

Expand All @@ -878,7 +878,7 @@ static int rockchip_spi_resume(struct device *dev)
clk_disable_unprepare(rs->apb_pclk);
}

return ret;
return 0;
}
#endif /* CONFIG_PM_SLEEP */

Expand All @@ -901,14 +901,14 @@ static int rockchip_spi_runtime_resume(struct device *dev)
struct rockchip_spi *rs = spi_master_get_devdata(master);

ret = clk_prepare_enable(rs->apb_pclk);
if (ret)
if (ret < 0)
return ret;

ret = clk_prepare_enable(rs->spiclk);
if (ret)
if (ret < 0)
clk_disable_unprepare(rs->apb_pclk);

return ret;
return 0;
}
#endif /* CONFIG_PM */

Expand Down

0 comments on commit 43de979

Please sign in to comment.