OSDN Git Service

staging: mt7621-mmc: Remove dead codepath from probe function
authorChristian Lütke-Stetzkamp <christian@lkamp.de>
Wed, 4 Apr 2018 20:15:40 +0000 (22:15 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Apr 2018 13:34:03 +0000 (15:34 +0200)
The probe function contains lots of code, that is never used, because
the fields it checks for in the msdc_hw structure are never
initialized. Removing them should be safe.

Signed-off-by: Christian Lütke-Stetzkamp <christian@lkamp.de>
Reviewed-by: NeilBrown <neil@brown.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/mt7621-mmc/sd.c

index 840fb79..695db4d 100644 (file)
 static struct msdc_regs *msdc_reg[HOST_MAX_NUM];
 #endif
 
-
 static int cd_active_low = 1;
 
 //=================================
@@ -2807,25 +2806,6 @@ static int msdc_drv_probe(struct platform_device *pdev)
                goto release;
        // mt65xx_irq_unmask(irq); /* --- by chhung */
 
-       if (hw->flags & MSDC_CD_PIN_EN) { /* not set for sdio */
-               if (hw->request_cd_eirq) { /* not set for MT6575 */
-                       hw->request_cd_eirq(msdc_eirq_cd, (void *)host); /* msdc_eirq_cd will not be used! */
-               }
-       }
-
-       if (hw->request_sdio_eirq) /* set to combo_sdio_request_eirq() for WIFI */
-               hw->request_sdio_eirq(msdc_eirq_sdio, (void *)host); /* msdc_eirq_sdio() will be called when EIRQ */
-
-       if (hw->register_pm) {/* yes for sdio */
-#ifdef CONFIG_PM
-               hw->register_pm(msdc_pm, (void *)host);  /* combo_sdio_register_pm() */
-#endif
-               if (hw->flags & MSDC_SYS_SUSPEND) { /* will not set for WIFI */
-                       ERR_MSG("MSDC_SYS_SUSPEND and register_pm both set");
-               }
-               //mmc->pm_flags |= MMC_PM_IGNORE_PM_NOTIFY; /* pm not controlled by system but by client. */ /* --- by chhung */
-       }
-
        platform_set_drvdata(pdev, mmc);
 
        ret = mmc_add_host(mmc);