[PATCH 2/6] dma: mxs-dma: let dma_is_apbh and apbh_is_old take parameter

[Vinod Koul]

On Mon, 2012-05-07 at 22:23 +0800, Shawn Guo wrote:
> Let macros dma_is_apbh and apbh_is_old take mxs_dma as parameter
> to make the code easy to read.
> 
> Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
> ---
>  drivers/dma/mxs-dma.c |   24 ++++++++++++------------
>  1 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
> index bd27818..e801fbf 100644
> --- a/drivers/dma/mxs-dma.c
> +++ b/drivers/dma/mxs-dma.c
> @@ -38,10 +38,10 @@
>  
>  #define MXS_DMA_APBH		0
>  #define MXS_DMA_APBX		1
> -#define dma_is_apbh()		(mxs_dma->dev_id == MXS_DMA_APBH)
> +#define dma_is_apbh(mxs_dma)	(mxs_dma->dev_id == MXS_DMA_APBH)
>  
>  #define APBH_VERSION_LATEST	3
> -#define apbh_is_old()		(mxs_dma->version < APBH_VERSION_LATEST)
> +#define apbh_is_old(mxs_dma)	(mxs_dma->version < APBH_VERSION_LATEST)
>  
>  #define HW_APBHX_CTRL0				0x000
>  #define BM_APBH_CTRL0_APB_BURST8_EN		(1 << 29)
> @@ -54,10 +54,10 @@
>  #define HW_APBH_VERSION				(cpu_is_mx23() ? 0x3f0 : 0x800)
>  #define HW_APBX_VERSION				0x800
>  #define BP_APBHX_VERSION_MAJOR			24
> -#define HW_APBHX_CHn_NXTCMDAR(n) \
> -	(((dma_is_apbh() && apbh_is_old()) ? 0x050 : 0x110) + (n) * 0x70)
> -#define HW_APBHX_CHn_SEMA(n) \
> -	(((dma_is_apbh() && apbh_is_old()) ? 0x080 : 0x140) + (n) * 0x70)
> +#define HW_APBHX_CHn_NXTCMDAR(d, n) \
> +	(((dma_is_apbh(d) && apbh_is_old(d)) ? 0x050 : 0x110) + (n) * 0x70)
> +#define HW_APBHX_CHn_SEMA(d, n) \
> +	(((dma_is_apbh(d) && apbh_is_old(d)) ? 0x080 : 0x140) + (n) * 0x70)
while at it, care to say what the above magic numbers mean. Isnt
terrible clear to me.
>  
>  /*
>   * ccw bits definitions
> @@ -136,7 +136,7 @@ static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan)
>  	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
>  	int chan_id = mxs_chan->chan.chan_id;
>  
> -	if (dma_is_apbh() && apbh_is_old())
> +	if (dma_is_apbh(mxs_dma) && apbh_is_old(mxs_dma))
>  		writel(1 << (chan_id + BP_APBH_CTRL0_RESET_CHANNEL),
>  			mxs_dma->base + HW_APBHX_CTRL0 + STMP_OFFSET_REG_SET);
>  	else
> @@ -151,10 +151,10 @@ static void mxs_dma_enable_chan(struct mxs_dma_chan *mxs_chan)
>  
>  	/* set cmd_addr up */
>  	writel(mxs_chan->ccw_phys,
> -		mxs_dma->base + HW_APBHX_CHn_NXTCMDAR(chan_id));
> +		mxs_dma->base + HW_APBHX_CHn_NXTCMDAR(mxs_dma, chan_id));
>  
>  	/* write 1 to SEMA to kick off the channel */
> -	writel(1, mxs_dma->base + HW_APBHX_CHn_SEMA(chan_id));
> +	writel(1, mxs_dma->base + HW_APBHX_CHn_SEMA(mxs_dma, chan_id));
>  }
>  
>  static void mxs_dma_disable_chan(struct mxs_dma_chan *mxs_chan)
> @@ -168,7 +168,7 @@ static void mxs_dma_pause_chan(struct mxs_dma_chan *mxs_chan)
>  	int chan_id = mxs_chan->chan.chan_id;
>  
>  	/* freeze the channel */
> -	if (dma_is_apbh() && apbh_is_old())
> +	if (dma_is_apbh(mxs_dma) && apbh_is_old(mxs_dma))
>  		writel(1 << chan_id,
>  			mxs_dma->base + HW_APBHX_CTRL0 + STMP_OFFSET_REG_SET);
>  	else
> @@ -184,7 +184,7 @@ static void mxs_dma_resume_chan(struct mxs_dma_chan *mxs_chan)
>  	int chan_id = mxs_chan->chan.chan_id;
>  
>  	/* unfreeze the channel */
> -	if (dma_is_apbh() && apbh_is_old())
> +	if (dma_is_apbh(mxs_dma) && apbh_is_old(mxs_dma))
>  		writel(1 << chan_id,
>  			mxs_dma->base + HW_APBHX_CTRL0 + STMP_OFFSET_REG_CLR);
>  	else
> @@ -578,7 +578,7 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma)
>  				BP_APBHX_VERSION_MAJOR;
>  
>  	/* enable apbh burst */
> -	if (dma_is_apbh()) {
> +	if (dma_is_apbh(mxs_dma)) {
>  		writel(BM_APBH_CTRL0_APB_BURST_EN,
>  			mxs_dma->base + HW_APBHX_CTRL0 + STMP_OFFSET_REG_SET);
>  		writel(BM_APBH_CTRL0_APB_BURST8_EN,


-- 
~Vinod