| Message ID | abf8a44d-7381-ea1f-44c6-27ccec3f647d@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Heiner Kallweit <hkallweit1@gmail.com> writes: > The remove callback is called only if probe finished successfully. > Therefore these checks are not needed. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Kevin Hilman <khilman@baylibre.com> Tested-by: Kevin Hilman <khilman@baylibre.com> > --- > v2: > - no changes > --- > drivers/mmc/host/meson-gx-mmc.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c > index 48ce4ba4..bc787444 100644 > --- a/drivers/mmc/host/meson-gx-mmc.c > +++ b/drivers/mmc/host/meson-gx-mmc.c > @@ -811,15 +811,11 @@ static int meson_mmc_remove(struct platform_device *pdev) > { > struct meson_host *host = dev_get_drvdata(&pdev->dev); > > - if (WARN_ON(!host)) > - return 0; > - > /* disable interrupts */ > writel(0, host->regs + SD_EMMC_IRQ_EN); > > - if (host->bounce_buf) > - dma_free_coherent(host->dev, host->bounce_buf_size, > - host->bounce_buf, host->bounce_dma_addr); > + dma_free_coherent(host->dev, host->bounce_buf_size, > + host->bounce_buf, host->bounce_dma_addr); > > clk_disable_unprepare(host->cfg_div_clk); > clk_disable_unprepare(host->core_clk);
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 48ce4ba4..bc787444 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -811,15 +811,11 @@ static int meson_mmc_remove(struct platform_device *pdev) { struct meson_host *host = dev_get_drvdata(&pdev->dev); - if (WARN_ON(!host)) - return 0; - /* disable interrupts */ writel(0, host->regs + SD_EMMC_IRQ_EN); - if (host->bounce_buf) - dma_free_coherent(host->dev, host->bounce_buf_size, - host->bounce_buf, host->bounce_dma_addr); + dma_free_coherent(host->dev, host->bounce_buf_size, + host->bounce_buf, host->bounce_dma_addr); clk_disable_unprepare(host->cfg_div_clk); clk_disable_unprepare(host->core_clk);
The remove callback is called only if probe finished successfully. Therefore these checks are not needed. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- v2: - no changes --- drivers/mmc/host/meson-gx-mmc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)