Re: [PATCH] comedi: pcmmio: Fix coding style - use BIT macro

[Ian Abbott <abbotti@mev.co.uk>]

On 14/11/15 13:24, Ranjith Thangavel wrote:
> BIT macro is used for defining BIT location instead of
> shifting operator - coding style issue
>
> Signed-off-by: Ranjith Thangavel <ranjithece24@gmail.com>
> ---
>   drivers/staging/comedi/drivers/pcmmio.c |   20 ++++++++++----------
>   1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
> index f7ec224..f2aedc21 100644
> --- a/drivers/staging/comedi/drivers/pcmmio.c
> +++ b/drivers/staging/comedi/drivers/pcmmio.c
> @@ -84,20 +84,20 @@
>   #define PCMMIO_AI_LSB_REG			0x00
>   #define PCMMIO_AI_MSB_REG			0x01
>   #define PCMMIO_AI_CMD_REG			0x02
> -#define PCMMIO_AI_CMD_SE				BIT(7)
> +#define PCMMIO_AI_CMD_SE			BIT(7)
>   #define PCMMIO_AI_CMD_ODD_CHAN			BIT(6)
>   #define PCMMIO_AI_CMD_CHAN_SEL(x)		(((x) & 0x3) << 4)
>   #define PCMMIO_AI_CMD_RANGE(x)			(((x) & 0x3) << 2)
> -#define PCMMIO_RESOURCE_REG				0x02
> +#define PCMMIO_RESOURCE_REG			0x02
>   #define PCMMIO_RESOURCE_IRQ(x)			(((x) & 0xf) << 0)
>   #define PCMMIO_AI_STATUS_REG			0x03
>   #define PCMMIO_AI_STATUS_DATA_READY		BIT(7)
> -#define PCMMIO_AI_STATUS_DATA_DMA_PEND	BIT(6)
> -#define PCMMIO_AI_STATUS_CMD_DMA_PEND	BIT(5)
> +#define PCMMIO_AI_STATUS_DATA_DMA_PEND		BIT(6)
> +#define PCMMIO_AI_STATUS_CMD_DMA_PEND		BIT(5)
>   #define PCMMIO_AI_STATUS_IRQ_PEND		BIT(4)
> -#define PCMMIO_AI_STATUS_DATA_DRQ_ENA	BIT(2)
> +#define PCMMIO_AI_STATUS_DATA_DRQ_ENA		BIT(2)
>   #define PCMMIO_AI_STATUS_REG_SEL		BIT(3)
> -#define PCMMIO_AI_STATUS_CMD_DRQ_ENA	BIT(1)
> +#define PCMMIO_AI_STATUS_CMD_DRQ_ENA		BIT(1)
>   #define PCMMIO_AI_STATUS_IRQ_ENA		BIT(0)
>   #define PCMMIO_AI_RES_ENA_REG			0x03
>   #define PCMMIO_AI_RES_ENA_CMD_REG_ACCESS	0
> @@ -126,12 +126,12 @@
>   #define PCMMIO_AO_CMD_CHAN_SEL_ALL		(0x0f << 0)
>   #define PCMMIO_AO_STATUS_REG			0x0b
>   #define PCMMIO_AO_STATUS_DATA_READY		BIT(7)
> -#define PCMMIO_AO_STATUS_DATA_DMA_PEND	BIT(6)
> -#define PCMMIO_AO_STATUS_CMD_DMA_PEND	BIT(5)
> +#define PCMMIO_AO_STATUS_DATA_DMA_PEND		BIT(6)
> +#define PCMMIO_AO_STATUS_CMD_DMA_PEND		BIT(5)
>   #define PCMMIO_AO_STATUS_IRQ_PEND		BIT(4)
> -#define PCMMIO_AO_STATUS_DATA_DRQ_ENA	BIT(2)
> +#define PCMMIO_AO_STATUS_DATA_DRQ_ENA		BIT(2)
>   #define PCMMIO_AO_STATUS_REG_SEL		BIT(3)
> -#define PCMMIO_AO_STATUS_CMD_DRQ_ENA	BIT(1)
> +#define PCMMIO_AO_STATUS_CMD_DRQ_ENA		BIT(1)
>   #define PCMMIO_AO_STATUS_IRQ_ENA		BIT(0)
>   #define PCMMIO_AO_RESOURCE_ENA_REG		0x0b
>   #define PCMMIO_AO_2ND_DAC_OFFSET		0x04
>

This patch appears to be fixing the whitespace issues introduced by your 
previous patch of the same name, but your previous patch hasn't been 
applied because of the whitespace issues.

What you need to do in this case is merge this patch with your previous 
of the same name, for example by using an interactive git rebase with 
this patch marked as a 'fixup' patch.  Then submit the combined single 
patch using the '[PATCH v2]' tag in the email.

If that's a bit daunting, it might be easier for you to recreate the 
patch from scratch!

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-