Commit 4c02a65f authored by Christian Lütke-Stetzkamp's avatar Christian Lütke-Stetzkamp Committed by Greg Kroah-Hartman

staging: mt7621-mmc: Remove unused field get_cd_status from msdc_hw

The get_cd_status() field of msdc_hw is never set and there is only
one check for it being non zero, so it is deleted.
Signed-off-by: default avatarChristian Lütke-Stetzkamp <christian@lkamp.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d1a0db1e
...@@ -76,7 +76,6 @@ struct msdc_hw { ...@@ -76,7 +76,6 @@ struct msdc_hw {
/* external cd irq operations */ /* external cd irq operations */
void (*enable_cd_eirq)(void); void (*enable_cd_eirq)(void);
void (*disable_cd_eirq)(void); void (*disable_cd_eirq)(void);
int (*get_cd_status)(void);
}; };
extern struct msdc_hw msdc0_hw; extern struct msdc_hw msdc0_hw;
......
...@@ -513,7 +513,6 @@ static void msdc_tasklet_card(struct work_struct *work) ...@@ -513,7 +513,6 @@ static void msdc_tasklet_card(struct work_struct *work)
struct msdc_host *host = (struct msdc_host *)container_of(work, struct msdc_host *host = (struct msdc_host *)container_of(work,
struct msdc_host, card_delaywork.work); struct msdc_host, card_delaywork.work);
#endif #endif
struct msdc_hw *hw = host->hw;
u32 base = host->base; u32 base = host->base;
u32 inserted; u32 inserted;
u32 status = 0; u32 status = 0;
...@@ -521,15 +520,11 @@ static void msdc_tasklet_card(struct work_struct *work) ...@@ -521,15 +520,11 @@ static void msdc_tasklet_card(struct work_struct *work)
spin_lock(&host->lock); spin_lock(&host->lock);
if (hw->get_cd_status) { // NULL status = sdr_read32(MSDC_PS);
inserted = hw->get_cd_status(); if (cd_active_low)
} else { inserted = (status & MSDC_PS_CDSTS) ? 0 : 1;
status = sdr_read32(MSDC_PS); else
if (cd_active_low) inserted = (status & MSDC_PS_CDSTS) ? 1 : 0;
inserted = (status & MSDC_PS_CDSTS) ? 0 : 1;
else
inserted = (status & MSDC_PS_CDSTS) ? 1 : 0;
}
#if 0 #if 0
change = host->card_inserted ^ inserted; change = host->card_inserted ^ inserted;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment