From: Jeffy Chen <jeffy.chen@rock-chips.com> To: linux-kernel@vger.kernel.org, broonie@kernel.org Cc: briannorris@chromium.org, dianders@chromium.org, heiko@sntech.de, Jeffy Chen <jeffy.chen@rock-chips.com>, linux-spi@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] spi: rockchip: Slightly rework return value handling Date: Mon, 7 Aug 2017 20:40:18 +0800 [thread overview] Message-ID: <1502109620-26813-2-git-send-email-jeffy.chen@rock-chips.com> (raw) In-Reply-To: <1502109620-26813-1-git-send-email-jeffy.chen@rock-chips.com> Slightly rework return value handling, no functional changes. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> --- drivers/spi/spi-rockchip.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 0b4a52b..5497650 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -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; @@ -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; } @@ -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; } @@ -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)) { @@ -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); @@ -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 */ @@ -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 */ -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: jeffy.chen@rock-chips.com (Jeffy Chen) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] spi: rockchip: Slightly rework return value handling Date: Mon, 7 Aug 2017 20:40:18 +0800 [thread overview] Message-ID: <1502109620-26813-2-git-send-email-jeffy.chen@rock-chips.com> (raw) In-Reply-To: <1502109620-26813-1-git-send-email-jeffy.chen@rock-chips.com> Slightly rework return value handling, no functional changes. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> --- drivers/spi/spi-rockchip.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 0b4a52b..5497650 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -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; @@ -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; } @@ -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; } @@ -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)) { @@ -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); @@ -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 */ @@ -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 */ -- 2.1.4
next prev parent reply other threads:[~2017-08-07 12:40 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-08-07 12:40 [PATCH 0/3] Fix clock handling in rockchip spi suspend/resume/remove Jeffy Chen 2017-08-07 12:40 ` Jeffy Chen 2017-08-07 12:40 ` Jeffy Chen 2017-08-07 12:40 ` Jeffy Chen [this message] 2017-08-07 12:40 ` [PATCH 1/3] spi: rockchip: Slightly rework return value handling Jeffy Chen 2017-08-07 15:53 ` Applied "spi: rockchip: Slightly rework return value handling" to the spi tree Mark Brown 2017-08-07 15:53 ` Mark Brown 2017-08-07 15:53 ` Mark Brown 2017-08-07 12:40 ` [PATCH 2/3] spi: rockchip: Fix clock handling in remove Jeffy Chen 2017-08-07 12:40 ` Jeffy Chen 2017-08-07 15:53 ` Applied "spi: rockchip: Fix clock handling in remove" to the spi tree Mark Brown 2017-08-07 15:53 ` Mark Brown 2017-08-07 15:53 ` Mark Brown 2017-08-07 15:53 ` Mark Brown 2017-08-07 12:40 ` [PATCH 3/3] spi: rockchip: Fix clock handling in suspend/resume Jeffy Chen 2017-08-07 12:40 ` Jeffy Chen 2017-08-07 15:53 ` Applied "spi: rockchip: Fix clock handling in suspend/resume" to the spi tree Mark Brown 2017-08-07 15:53 ` Mark Brown 2017-08-07 15:53 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1502109620-26813-2-git-send-email-jeffy.chen@rock-chips.com \ --to=jeffy.chen@rock-chips.com \ --cc=briannorris@chromium.org \ --cc=broonie@kernel.org \ --cc=dianders@chromium.org \ --cc=heiko@sntech.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=linux-spi@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.