On 16 July 2014 11:53, Laurent Pinchart
<[email protected]> wrote:
> This simplifies probe error and remove code paths.
>
> Signed-off-by: Laurent Pinchart <[email protected]>
Thanks! Applied for next.
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci-pxav3.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> This patch applies on top of Xiang Wang's " mmc: sdhci-pxav3: fix error
> handling of sdhci_add_host" patch.
>
> diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
> index 19b7c8a..e90a188 100644
> --- a/drivers/mmc/host/sdhci-pxav3.c
> +++ b/drivers/mmc/host/sdhci-pxav3.c
> @@ -288,15 +288,13 @@ static int sdhci_pxav3_probe(struct platform_device
> *pdev)
> int ret;
> struct clk *clk;
>
> - pxa = kzalloc(sizeof(struct sdhci_pxa), GFP_KERNEL);
> + pxa = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_pxa), GFP_KERNEL);
> if (!pxa)
> return -ENOMEM;
>
> host = sdhci_pltfm_init(pdev, &sdhci_pxav3_pdata, 0);
> - if (IS_ERR(host)) {
> - kfree(pxa);
> + if (IS_ERR(host))
> return PTR_ERR(host);
> - }
>
> if (of_device_is_compatible(np, "marvell,armada-380-sdhci")) {
> ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info());
> @@ -308,7 +306,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
> pltfm_host = sdhci_priv(host);
> pltfm_host->priv = pxa;
>
> - clk = clk_get(dev, NULL);
> + clk = devm_clk_get(dev, NULL);
> if (IS_ERR(clk)) {
> dev_err(dev, "failed to get io clock\n");
> ret = PTR_ERR(clk);
> @@ -389,11 +387,9 @@ err_add_host:
> err_of_parse:
> err_cd_req:
> clk_disable_unprepare(clk);
> - clk_put(clk);
> err_clk_get:
> err_mbus_win:
> sdhci_pltfm_free(pdev);
> - kfree(pxa);
> return ret;
> }
>
> @@ -408,10 +404,8 @@ static int sdhci_pxav3_remove(struct platform_device
> *pdev)
> pm_runtime_disable(&pdev->dev);
>
> clk_disable_unprepare(pltfm_host->clk);
> - clk_put(pltfm_host->clk);
>
> sdhci_pltfm_free(pdev);
> - kfree(pxa);
>
> return 0;
> }
> --
> Regards,
>
> Laurent Pinchart
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
