korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

[MMC] Clean up wbsd detection handling

Browse Source 
The wbsd driver's card detection routing is a bit of a mess. This
patch cleans up the routine and makes it a bit more comprihensible.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Pierre Ossman 2005-09-12 20:36:19 +01:00 committed by Russell King
parent e062c8ae85
commit 210ce2a750
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/mmc/wbsd.c
View File

@ -1136,6 +1136,7 @@ static void wbsd_tasklet_card(unsigned long param)
{
struct wbsd_host* host = (struct wbsd_host*)param;
u8 csr;
int delay = -1;
spin_lock(&host->lock);
@ -1155,16 +1156,8 @@ static void wbsd_tasklet_card(unsigned long param)
DBG("Card inserted\n");
host->flags |= WBSD_FCARD_PRESENT;
spin_unlock(&host->lock);
/*
* Delay card detection to allow electrical connections
* to stabilise.
*/
mmc_detect_change(host->mmc, msecs_to_jiffies(500));
delay = 500;
}
else
spin_unlock(&host->lock);
}
else if (host->flags & WBSD_FCARD_PRESENT)
{
@ -1181,15 +1174,17 @@ static void wbsd_tasklet_card(unsigned long param)
tasklet_schedule(&host->finish_tasklet);
}
delay = 0;
}
/*
* Unlock first since we might get a call back.
*/
spin_unlock(&host->lock);
mmc_detect_change(host->mmc, 0);
}
else
spin_unlock(&host->lock);
if (delay != -1)
mmc_detect_change(host->mmc, msecs_to_jiffies(delay));
}
static void wbsd_tasklet_fifo(unsigned long param)