Clean up wbsd detection handling
PATCH 1/1 Clean up wbsd detection handling
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 <[email protected]>
---
drivers/mmc/wbsd.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-)
drivers/mmc/wbsd.c +12 -16
@@ -1136,6 +1136,7 @@ static void wbsd_tasklet_card(unsigned l {struct wbsd_host * host = (struct wbsd_host *)param;u8 csr; +int delay =-1 ;spin_lock (&host->lock);
@@ -1155,15 +1156,8 @@ static void wbsd_tasklet_card(unsigned lDBG ("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 ) {
@@ -1180,15 +1174,17 @@ static void wbsd_tasklet_card(unsigned ltasklet_schedule (&host->finish_tasklet); } -/* -* Unlock first since we might get a call back. -*/ -spin_unlock (&host->lock); - -mmc_detect_change (host->mmc,0 ); + delay =0 ; } -else -spin_unlock (&host->lock); + +/* +* Unlock first since we might get a call back. +*/ + +spin_unlock (&host->lock); + +if (delay !=-1 ) +mmc_detect_change (host->mmc,msecs_to_jiffies (delay)); }static void wbsd_tasklet_fifo (unsigned long param)
PATCH 1/1 Clean up wbsd detection handling
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 <[email protected]>
---
(updated to current tree)
drivers/mmc/wbsd.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-)
drivers/mmc/wbsd.c +12 -17
@@ -1136,6 +1136,7 @@ static void wbsd_tasklet_card(unsigned l {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 lDBG ("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 ltasklet_schedule (&host->finish_tasklet); } -/* -* Unlock first since we might get a call back. -*/ -spin_unlock (&host->lock); - -mmc_detect_change (host->mmc,0 ); + delay =0 ; } -else -spin_unlock (&host->lock); + +/* +* Unlock first since we might get a call back. +*/ + +spin_unlock (&host->lock); + +if (delay !=-1 ) +mmc_detect_change (host->mmc,msecs_to_jiffies (delay)); }static void wbsd_tasklet_fifo (unsigned long param)
Quoted 6 lines · Pierre Ossman
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 <[email protected]>---
Resend as attachment.
Clean up wbsd detection handling
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 <[email protected]>
---
drivers/mmc/wbsd.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-)
drivers/mmc/wbsd.c +12 -17
@@ -1136,6 +1136,7 @@ static void wbsd_tasklet_card(unsigned l {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 lDBG ("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 ltasklet_schedule (&host->finish_tasklet); } -/* -* Unlock first since we might get a call back. -*/ -spin_unlock (&host->lock); - -mmc_detect_change (host->mmc,0 ); + delay =0 ; } -else -spin_unlock (&host->lock); + +/* +* Unlock first since we might get a call back. +*/ + +spin_unlock (&host->lock); + +if (delay !=-1 ) +mmc_detect_change (host->mmc,msecs_to_jiffies (delay)); }static void wbsd_tasklet_fifo (unsigned long param)