On 4 June 2014 13:42, Ben Dooks <[email protected]> wrote: > Remove the error path items that are no longer needed. The mmc card-detect > code cleans up after itself (and registers with devm) and the host error > is the same as the clock disable. > > Signed-off-by: Ben Dooks <[email protected]>
Signed-off-by: Ulf Hansson <[email protected]> > --- > drivers/mmc/host/sh_mmcif.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c > index b378aa0..35c77ad 100644 > --- a/drivers/mmc/host/sh_mmcif.c > +++ b/drivers/mmc/host/sh_mmcif.c > @@ -1458,14 +1458,14 @@ static int sh_mmcif_probe(struct platform_device > *pdev) > if (pd && pd->use_cd_gpio) { > ret = mmc_gpio_request_cd(mmc, pd->cd_gpio, 0); > if (ret < 0) > - goto erqcd; > + goto err_clk; > } > > mutex_init(&host->thread_lock); > > ret = mmc_add_host(mmc); > if (ret < 0) > - goto emmcaddh; > + goto err_clk; > > dev_pm_qos_expose_latency_limit(&pdev->dev, 100); > > @@ -1476,8 +1476,6 @@ static int sh_mmcif_probe(struct platform_device *pdev) > clk_disable_unprepare(host->hclk); > return ret; > > -emmcaddh: > -erqcd: > err_clk: > clk_disable_unprepare(host->hclk); > err_pm: > -- > 2.0.0.rc2 > -- 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
