mmc: mmc_spi: Remove useless NULL check at ->remove()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 27 Mar 2019 18:01:07 +0000 (20:01 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 15 Apr 2019 09:55:54 +0000 (11:55 +0200)
The mmc pointer can't be NULL at ->remove(), drop the useless check.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/mmc_spi.c

index 36baa9e..dc2ad45 100644 (file)
@@ -1499,31 +1499,27 @@ nomem:
 static int mmc_spi_remove(struct spi_device *spi)
 {
        struct mmc_host         *mmc = dev_get_drvdata(&spi->dev);
-       struct mmc_spi_host     *host;
-
-       if (mmc) {
-               host = mmc_priv(mmc);
+       struct mmc_spi_host     *host = mmc_priv(mmc);
 
-               /* prevent new mmc_detect_change() calls */
-               if (host->pdata && host->pdata->exit)
-                       host->pdata->exit(&spi->dev, mmc);
+       /* prevent new mmc_detect_change() calls */
+       if (host->pdata && host->pdata->exit)
+               host->pdata->exit(&spi->dev, mmc);
 
-               mmc_remove_host(mmc);
+       mmc_remove_host(mmc);
 
-               if (host->dma_dev) {
-                       dma_unmap_single(host->dma_dev, host->ones_dma,
-                               MMC_SPI_BLOCKSIZE, DMA_TO_DEVICE);
-                       dma_unmap_single(host->dma_dev, host->data_dma,
-                               sizeof(*host->data), DMA_BIDIRECTIONAL);
-               }
+       if (host->dma_dev) {
+               dma_unmap_single(host->dma_dev, host->ones_dma,
+                       MMC_SPI_BLOCKSIZE, DMA_TO_DEVICE);
+               dma_unmap_single(host->dma_dev, host->data_dma,
+                       sizeof(*host->data), DMA_BIDIRECTIONAL);
+       }
 
-               kfree(host->data);
-               kfree(host->ones);
+       kfree(host->data);
+       kfree(host->ones);
 
-               spi->max_speed_hz = mmc->f_max;
-               mmc_free_host(mmc);
-               mmc_spi_put_pdata(spi);
-       }
+       spi->max_speed_hz = mmc->f_max;
+       mmc_free_host(mmc);
+       mmc_spi_put_pdata(spi);
        return 0;
 }