Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754797AbbKXSMr (ORCPT ); Tue, 24 Nov 2015 13:12:47 -0500 Received: from mail-wm0-f54.google.com ([74.125.82.54]:37228 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754612AbbKXSMp (ORCPT ); Tue, 24 Nov 2015 13:12:45 -0500 Subject: Re: [PATCH v2] spi: mediatek: revise mtk_spi_probe() failure flow To: Leilk Liu , Mark Brown References: <1448332712-29039-1-git-send-email-leilk.liu@mediatek.com> Cc: Mark Rutland , Sascha Hauer , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, linux-mediatek@lists.infradead.org From: Matthias Brugger Message-ID: <5654A89A.3090202@gmail.com> Date: Tue, 24 Nov 2015 19:12:42 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1448332712-29039-1-git-send-email-leilk.liu@mediatek.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2540 Lines: 79 On 24/11/15 03:38, Leilk Liu wrote: > This patch revises failure flow while pm_runtime_enable(). Please write a proper commit message explaining what this patch does. > > Signed-off-by: Leilk Liu > --- > drivers/spi/spi-mt65xx.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c > index 6c1a96e..00a36da 100644 > --- a/drivers/spi/spi-mt65xx.c > +++ b/drivers/spi/spi-mt65xx.c > @@ -607,7 +607,8 @@ static int mtk_spi_probe(struct platform_device *pdev) > ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk); > if (ret < 0) { > dev_err(&pdev->dev, "failed to clk_set_parent (%d)\n", ret); > - goto err_disable_clk; > + clk_disable_unprepare(mdata->spi_clk); > + goto err_put_master; > } > > clk_disable_unprepare(mdata->spi_clk); > @@ -617,7 +618,7 @@ static int mtk_spi_probe(struct platform_device *pdev) > ret = devm_spi_register_master(&pdev->dev, master); > if (ret) { > dev_err(&pdev->dev, "failed to register master (%d)\n", ret); > - goto err_put_master; > + goto err_disable_runtime_pm; > } > > if (mdata->dev_comp->need_pad_sel) { > @@ -626,14 +627,14 @@ static int mtk_spi_probe(struct platform_device *pdev) > "pad_num does not match num_chipselect(%d != %d)\n", > mdata->pad_num, master->num_chipselect); > ret = -EINVAL; > - goto err_put_master; > + goto err_disable_runtime_pm; > } > > if (!master->cs_gpios && master->num_chipselect > 1) { > dev_err(&pdev->dev, > "cs_gpios not specified and num_chipselect > 1\n"); > ret = -EINVAL; > - goto err_put_master; > + goto err_disable_runtime_pm; > } > > if (master->cs_gpios) { > @@ -644,7 +645,7 @@ static int mtk_spi_probe(struct platform_device *pdev) > if (ret) { > dev_err(&pdev->dev, > "can't get CS GPIO %i\n", i); > - goto err_put_master; > + goto err_disable_runtime_pm; > } > } > } > @@ -652,8 +653,8 @@ static int mtk_spi_probe(struct platform_device *pdev) > > return 0; > > -err_disable_clk: > - clk_disable_unprepare(mdata->spi_clk); > +err_disable_runtime_pm: > + pm_runtime_disable(&pdev->dev); > err_put_master: > spi_master_put(master); > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/