lkml.org 
[lkml]   [2005]   [Sep]   [12]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    DateMon, 12 Sep 2005 09:52:06 +0200
    FromPierre Ossman <>
    Subject[PATCH] 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 <drzeus@drzeus.cx>
    ---
    (updated to current tree)
    
     drivers/mmc/wbsd.c |   29 ++++++++++++-----------------
     1 files changed, 12 insertions(+), 17 deletions(-)
    diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
    --- a/drivers/mmc/wbsd.c
    +++ b/drivers/mmc/wbsd.c
    @@ -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 l
     			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 l
     			tasklet_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)
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at  http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at  http://www.tux.org/lkml/
    
    
    \
     
     \ /
      Last update: 2005-09-12 07:54    [from the cache]
    ©2003-2008