Re: [PATCH v2 2/4] spi/dw_spi: remove the un-necessary flush()

[Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>]

On Wed, Mar 30, 2011 at 11:09:53PM +0800, Feng Tang wrote:
> From: Alek Du <alek.du-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> 
> The flush() is used to drain all the left data in rx fifo, currently
> is is always called together with disabling hw. But from spec, disabling
> hw will also reset all the fifo, so flush() is not needed.
> 
> Signed-off-by: Alek Du <alek.du-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Signed-off-by: Feng Tang <feng.tang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

Applied, thanks.

g.

> ---
>  drivers/spi/dw_spi.c |   15 +--------------
>  1 files changed, 1 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c
> index c4fca3d..d3aaf8d 100644
> --- a/drivers/spi/dw_spi.c
> +++ b/drivers/spi/dw_spi.c
> @@ -173,17 +173,6 @@ static void wait_till_not_busy(struct dw_spi *dws)
>  		"DW SPI: Status keeps busy for 5000us after a read/write!\n");
>  }
>  
> -static void flush(struct dw_spi *dws)
> -{
> -	while (dw_readw(dws, sr) & SR_RF_NOT_EMPT) {
> -		dw_readw(dws, dr);
> -		cpu_relax();
> -	}
> -
> -	wait_till_not_busy(dws);
> -}
> -
> -
>  static int dw_writer(struct dw_spi *dws)
>  {
>  	u16 txw = 0;
> @@ -297,8 +286,7 @@ static void giveback(struct dw_spi *dws)
>  
>  static void int_error_stop(struct dw_spi *dws, const char *msg)
>  {
> -	/* Stop and reset hw */
> -	flush(dws);
> +	/* Stop the hw */
>  	spi_enable_chip(dws, 0);
>  
>  	dev_err(&dws->master->dev, "%s\n", msg);
> @@ -800,7 +788,6 @@ static void spi_hw_init(struct dw_spi *dws)
>  	spi_enable_chip(dws, 0);
>  	spi_mask_intr(dws, 0xff);
>  	spi_enable_chip(dws, 1);
> -	flush(dws);
>  
>  	/*
>  	 * Try to detect the FIFO depth if not set by interface driver,
> -- 
> 1.7.0.4
> 

------------------------------------------------------------------------------
Create and publish websites with WebMatrix
Use the most popular FREE web apps or write code yourself; 
WebMatrix provides all the features you need to develop and 
publish your website. http://p.sf.net/sfu/ms-webmatrix-sf