On Sun, 8 Nov 2020 at 16:00, <xiakaixu1987@xxxxxxxxx> wrote:
>
> From: Kaixu Xia <kaixuxia@xxxxxxxxxxx>
>
> pic32_sdhci_probe_platform() always returned 0, so there's no reason for
> a return value. In addition, pic32_sdhci_probe() checked the return value
> for possible error which is unnecessary.
>
> Convert pic32_sdhci_probe_platform() to a void function and remove the
> return value check. Fix the following Coccinelle warning:
>
> ./drivers/mmc/host/sdhci-pic32.c:127:5-8: Unneeded variable: "ret". Return "0" on line 137
>
> Reported-by: Tosk Robot <tencent_os_robot@xxxxxxxxxxx>
> Signed-off-by: Kaixu Xia <kaixuxia@xxxxxxxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci-pic32.c | 11 ++---------
> 1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pic32.c b/drivers/mmc/host/sdhci-pic32.c
> index 6ce1519ae177..6696b6bdd88e 100644
> --- a/drivers/mmc/host/sdhci-pic32.c
> +++ b/drivers/mmc/host/sdhci-pic32.c
> @@ -121,10 +121,9 @@ static void pic32_sdhci_shared_bus(struct platform_device *pdev)
> writel(bus, host->ioaddr + SDH_SHARED_BUS_CTRL);
> }
>
> -static int pic32_sdhci_probe_platform(struct platform_device *pdev,
> +static void pic32_sdhci_probe_platform(struct platform_device *pdev,
> struct pic32_sdhci_priv *pdata)
> {
> - int ret = 0;
> u32 caps_slot_type;
> struct sdhci_host *host = platform_get_drvdata(pdev);
>
> @@ -133,8 +132,6 @@ static int pic32_sdhci_probe_platform(struct platform_device *pdev,
> caps_slot_type = (host->caps & SDH_CAPS_SDH_SLOT_TYPE_MASK) >> 30;
> if (caps_slot_type == SDH_SLOT_TYPE_SHARED_BUS)
> pic32_sdhci_shared_bus(pdev);
> -
> - return ret;
> }
>
> static int pic32_sdhci_probe(struct platform_device *pdev)
> @@ -193,11 +190,7 @@ static int pic32_sdhci_probe(struct platform_device *pdev)
> if (ret)
> goto err_base_clk;
>
> - ret = pic32_sdhci_probe_platform(pdev, sdhci_pdata);
> - if (ret) {
> - dev_err(&pdev->dev, "failed to probe platform!\n");
> - goto err_base_clk;
> - }
> + pic32_sdhci_probe_platform(pdev, sdhci_pdata);
>
> ret = sdhci_add_host(host);
> if (ret)
> --
> 2.20.0
>
