redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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: Christian Lütke-Stetzkamp <christian@lkamp.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Lütke-Stetzkamp 2018-04-18 17:27:21 +02:00 committed by Greg Kroah-Hartman
parent d1a0db1eb3
commit 4c02a65fb2
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/mt7621-mmc/board.h
View file

@ -76,7 +76,6 @@ struct msdc_hw {
/* external cd irq operations */
void (*enable_cd_eirq)(void);
void (*disable_cd_eirq)(void);
int (*get_cd_status)(void);
};
extern struct msdc_hw msdc0_hw;

15
drivers/staging/mt7621-mmc/sd.c
View file

@ -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, card_delaywork.work);
#endif
struct msdc_hw *hw = host->hw;
u32 base = host->base;
u32 inserted;
u32 status = 0;
@ -521,15 +520,11 @@ static void msdc_tasklet_card(struct work_struct *work)
spin_lock(&host->lock);
if (hw->get_cd_status) { // NULL
inserted = hw->get_cd_status();
} else {
status = sdr_read32(MSDC_PS);
if (cd_active_low)
inserted = (status & MSDC_PS_CDSTS) ? 0 : 1;
else
inserted = (status & MSDC_PS_CDSTS) ? 1 : 0;
}
status = sdr_read32(MSDC_PS);
if (cd_active_low)
inserted = (status & MSDC_PS_CDSTS) ? 0 : 1;
else
inserted = (status & MSDC_PS_CDSTS) ? 1 : 0;
#if 0
change = host->card_inserted ^ inserted;