[PATCH 1/4] Staging: vme: Remove excessive blank lines.

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH 1/4] Staging: vme: Remove excessive blank lines.
@ 2016-11-01 22:27 Anton Leshchenko
  2016-11-01 22:27 ` [PATCH 2/4] Staging: vme: Use BIT macro for bit field definitions Anton Leshchenko
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Anton Leshchenko @ 2016-11-01 22:27 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel, Anton Leshchenko

To make code more readable, remove excessive blank lines.

Signed-off-by: Anton Leshchenko <antonl1911@gmail.com>
---
 drivers/staging/vme/devices/vme_pio2.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/staging/vme/devices/vme_pio2.h b/drivers/staging/vme/devices/vme_pio2.h
index d5d94c4..0b280ae 100644
--- a/drivers/staging/vme/devices/vme_pio2.h
+++ b/drivers/staging/vme/devices/vme_pio2.h
@@ -48,8 +48,6 @@ static const int PIO2_REGS_INT_MASK[8] = { PIO2_REGS_INT_MASK0,
 					PIO2_REGS_INT_MASK6,
 					PIO2_REGS_INT_MASK7 };
 
-
-
 #define PIO2_REGS_CTRL			0x18
 #define PIO2_REGS_VME_VECTOR		0x19
 #define PIO2_REGS_CNTR0			0x20
@@ -63,7 +61,6 @@ static const int PIO2_REGS_INT_MASK[8] = { PIO2_REGS_INT_MASK0,
 
 #define PIO2_REGS_ID			0x30
 
-
 /* PIO2_REGS_DATAx (0x0 - 0x3) */
 
 static const int PIO2_CHANNEL_BANK[32] = { 0, 0, 0, 0, 0, 0, 0, 0,
@@ -204,8 +201,6 @@ static const int PIO2_CNTR_SC_DEV[6] = { PIO2_CNTR_SC_DEV0, PIO2_CNTR_SC_DEV1,
 
 #define PIO2_CNTR_BCD			1
 
-
-
 enum pio2_bank_config { NOFIT, INPUT, OUTPUT, BOTH };
 enum pio2_int_config { NONE = 0, LOW2HIGH = 1, HIGH2LOW = 2, EITHER = 4 };
 
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/4] Staging: vme: Use BIT macro for bit field definitions.
  2016-11-01 22:27 [PATCH 1/4] Staging: vme: Remove excessive blank lines Anton Leshchenko
@ 2016-11-01 22:27 ` Anton Leshchenko
  2016-11-10 19:17   ` Dan Carpenter
  2016-11-01 22:27 ` [PATCH 3/4] Staging: vme: Add required identifier names Anton Leshchenko
  2016-11-01 22:27 ` [PATCH 4/4] Staging: vme: Fix parenthesis alignment Anton Leshchenko
  2 siblings, 1 reply; 6+ messages in thread
From: Anton Leshchenko @ 2016-11-01 22:27 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel, Anton Leshchenko

Instead of using shift operation use BIT macro for bit field
definitions.

Signed-off-by: Anton Leshchenko <antonl1911@gmail.com>
---
 drivers/staging/vme/devices/vme_pio2.h | 102 ++++++++++++++++-----------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/drivers/staging/vme/devices/vme_pio2.h b/drivers/staging/vme/devices/vme_pio2.h
index 0b280ae..9da3813 100644
--- a/drivers/staging/vme/devices/vme_pio2.h
+++ b/drivers/staging/vme/devices/vme_pio2.h
@@ -68,38 +68,38 @@ static const int PIO2_CHANNEL_BANK[32] = { 0, 0, 0, 0, 0, 0, 0, 0,
 					2, 2, 2, 2, 2, 2, 2, 2,
 					3, 3, 3, 3, 3, 3, 3, 3 };
 
-#define PIO2_CHANNEL0_BIT		(1 << 0)
-#define PIO2_CHANNEL1_BIT		(1 << 1)
-#define PIO2_CHANNEL2_BIT		(1 << 2)
-#define PIO2_CHANNEL3_BIT		(1 << 3)
-#define PIO2_CHANNEL4_BIT		(1 << 4)
-#define PIO2_CHANNEL5_BIT		(1 << 5)
-#define PIO2_CHANNEL6_BIT		(1 << 6)
-#define PIO2_CHANNEL7_BIT		(1 << 7)
-#define PIO2_CHANNEL8_BIT		(1 << 0)
-#define PIO2_CHANNEL9_BIT		(1 << 1)
-#define PIO2_CHANNEL10_BIT		(1 << 2)
-#define PIO2_CHANNEL11_BIT		(1 << 3)
-#define PIO2_CHANNEL12_BIT		(1 << 4)
-#define PIO2_CHANNEL13_BIT		(1 << 5)
-#define PIO2_CHANNEL14_BIT		(1 << 6)
-#define PIO2_CHANNEL15_BIT		(1 << 7)
-#define PIO2_CHANNEL16_BIT		(1 << 0)
-#define PIO2_CHANNEL17_BIT		(1 << 1)
-#define PIO2_CHANNEL18_BIT		(1 << 2)
-#define PIO2_CHANNEL19_BIT		(1 << 3)
-#define PIO2_CHANNEL20_BIT		(1 << 4)
-#define PIO2_CHANNEL21_BIT		(1 << 5)
-#define PIO2_CHANNEL22_BIT		(1 << 6)
-#define PIO2_CHANNEL23_BIT		(1 << 7)
-#define PIO2_CHANNEL24_BIT		(1 << 0)
-#define PIO2_CHANNEL25_BIT		(1 << 1)
-#define PIO2_CHANNEL26_BIT		(1 << 2)
-#define PIO2_CHANNEL27_BIT		(1 << 3)
-#define PIO2_CHANNEL28_BIT		(1 << 4)
-#define PIO2_CHANNEL29_BIT		(1 << 5)
-#define PIO2_CHANNEL30_BIT		(1 << 6)
-#define PIO2_CHANNEL31_BIT		(1 << 7)
+#define PIO2_CHANNEL0_BIT		BIT(0)
+#define PIO2_CHANNEL1_BIT		BIT(1)
+#define PIO2_CHANNEL2_BIT		BIT(2)
+#define PIO2_CHANNEL3_BIT		BIT(3)
+#define PIO2_CHANNEL4_BIT		BIT(4)
+#define PIO2_CHANNEL5_BIT		BIT(5)
+#define PIO2_CHANNEL6_BIT		BIT(6)
+#define PIO2_CHANNEL7_BIT		BIT(7)
+#define PIO2_CHANNEL8_BIT		BIT(0)
+#define PIO2_CHANNEL9_BIT		BIT(1)
+#define PIO2_CHANNEL10_BIT		BIT(2)
+#define PIO2_CHANNEL11_BIT		BIT(3)
+#define PIO2_CHANNEL12_BIT		BIT(4)
+#define PIO2_CHANNEL13_BIT		BIT(5)
+#define PIO2_CHANNEL14_BIT		BIT(6)
+#define PIO2_CHANNEL15_BIT		BIT(7)
+#define PIO2_CHANNEL16_BIT		BIT(0)
+#define PIO2_CHANNEL17_BIT		BIT(1)
+#define PIO2_CHANNEL18_BIT		BIT(2)
+#define PIO2_CHANNEL19_BIT		BIT(3)
+#define PIO2_CHANNEL20_BIT		BIT(4)
+#define PIO2_CHANNEL21_BIT		BIT(5)
+#define PIO2_CHANNEL22_BIT		BIT(6)
+#define PIO2_CHANNEL23_BIT		BIT(7)
+#define PIO2_CHANNEL24_BIT		BIT(0)
+#define PIO2_CHANNEL25_BIT		BIT(1)
+#define PIO2_CHANNEL26_BIT		BIT(2)
+#define PIO2_CHANNEL27_BIT		BIT(3)
+#define PIO2_CHANNEL28_BIT		BIT(4)
+#define PIO2_CHANNEL29_BIT		BIT(5)
+#define PIO2_CHANNEL30_BIT		BIT(6)
+#define PIO2_CHANNEL31_BIT		BIT(7)
 
 static const int PIO2_CHANNEL_BIT[32] = { PIO2_CHANNEL0_BIT, PIO2_CHANNEL1_BIT,
 					PIO2_CHANNEL2_BIT, PIO2_CHANNEL3_BIT,
@@ -120,12 +120,12 @@ static const int PIO2_CHANNEL_BIT[32] = { PIO2_CHANNEL0_BIT, PIO2_CHANNEL1_BIT,
 					};
 
 /* PIO2_REGS_INT_STAT_CNTR (0xc) */
-#define PIO2_COUNTER0			(1 << 0)
-#define PIO2_COUNTER1			(1 << 1)
-#define PIO2_COUNTER2			(1 << 2)
-#define PIO2_COUNTER3			(1 << 3)
-#define PIO2_COUNTER4			(1 << 4)
-#define PIO2_COUNTER5			(1 << 5)
+#define PIO2_COUNTER0			BIT(0)
+#define PIO2_COUNTER1			BIT(1)
+#define PIO2_COUNTER2			BIT(2)
+#define PIO2_COUNTER3			BIT(3)
+#define PIO2_COUNTER4			BIT(4)
+#define PIO2_COUNTER5			BIT(5)
 
 static const int PIO2_COUNTER[6] = { PIO2_COUNTER0, PIO2_COUNTER1,
 					PIO2_COUNTER2, PIO2_COUNTER3,
@@ -133,8 +133,8 @@ static const int PIO2_COUNTER[6] = { PIO2_COUNTER0, PIO2_COUNTER1,
 
 /* PIO2_REGS_CTRL (0x18) */
 #define PIO2_VME_INT_MASK		0x7
-#define PIO2_LED			(1 << 6)
-#define PIO2_LOOP			(1 << 7)
+#define PIO2_LED			BIT(6)
+#define PIO2_LOOP			BIT(7)
 
 /* PIO2_REGS_VME_VECTOR (0x19) */
 #define PIO2_VME_VECTOR_SPUR		0x0
@@ -179,25 +179,25 @@ static const int PIO2_CNTR_CTRL[6] = { PIO2_REGS_CTRL_WRD0,
 					PIO2_REGS_CTRL_WRD1 };
 
 #define PIO2_CNTR_SC_DEV0		0
-#define PIO2_CNTR_SC_DEV1		(1 << 6)
-#define PIO2_CNTR_SC_DEV2		(2 << 6)
-#define PIO2_CNTR_SC_RDBACK		(3 << 6)
+#define PIO2_CNTR_SC_DEV1		BIT(6)
+#define PIO2_CNTR_SC_DEV2		BIT(7)
+#define PIO2_CNTR_SC_RDBACK		(BIT(6) | BIT(7))
 
 static const int PIO2_CNTR_SC_DEV[6] = { PIO2_CNTR_SC_DEV0, PIO2_CNTR_SC_DEV1,
 					PIO2_CNTR_SC_DEV2, PIO2_CNTR_SC_DEV0,
 					PIO2_CNTR_SC_DEV1, PIO2_CNTR_SC_DEV2 };
 
 #define PIO2_CNTR_RW_LATCH		0
-#define PIO2_CNTR_RW_LSB		(1 << 4)
-#define PIO2_CNTR_RW_MSB		(2 << 4)
-#define PIO2_CNTR_RW_BOTH		(3 << 4)
+#define PIO2_CNTR_RW_LSB		BIT(4)
+#define PIO2_CNTR_RW_MSB		BIT(5)
+#define PIO2_CNTR_RW_BOTH		(BIT(4) | BIT(5))
 
 #define PIO2_CNTR_MODE0			0
-#define PIO2_CNTR_MODE1			(1 << 1)
-#define PIO2_CNTR_MODE2			(2 << 1)
-#define PIO2_CNTR_MODE3			(3 << 1)
-#define PIO2_CNTR_MODE4			(4 << 1)
-#define PIO2_CNTR_MODE5			(5 << 1)
+#define PIO2_CNTR_MODE1			BIT(1)
+#define PIO2_CNTR_MODE2			BIT(2)
+#define PIO2_CNTR_MODE3			(BIT(1) | BIT(2))
+#define PIO2_CNTR_MODE4			BIT(4)
+#define PIO2_CNTR_MODE5			(BIT(1) | BIT(3))
 
 #define PIO2_CNTR_BCD			1
 
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/4] Staging: vme: Use BIT macro for bit field definitions.
  2016-11-01 22:27 ` [PATCH 2/4] Staging: vme: Use BIT macro for bit field definitions Anton Leshchenko
@ 2016-11-10 19:17   ` Dan Carpenter
  2016-11-14 14:46     ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Dan Carpenter @ 2016-11-10 19:17 UTC (permalink / raw)
  To: Anton Leshchenko; +Cc: gregkh, devel, linux-kernel

On Wed, Nov 02, 2016 at 01:27:09AM +0300, Anton Leshchenko wrote:
>  #define PIO2_CNTR_MODE0			0
> -#define PIO2_CNTR_MODE1			(1 << 1)
> -#define PIO2_CNTR_MODE2			(2 << 1)
> -#define PIO2_CNTR_MODE3			(3 << 1)
> -#define PIO2_CNTR_MODE4			(4 << 1)
> -#define PIO2_CNTR_MODE5			(5 << 1)
> +#define PIO2_CNTR_MODE1			BIT(1)
> +#define PIO2_CNTR_MODE2			BIT(2)
> +#define PIO2_CNTR_MODE3			(BIT(1) | BIT(2))
> +#define PIO2_CNTR_MODE4			BIT(4)

This should be BIT(3)

> +#define PIO2_CNTR_MODE5			(BIT(1) | BIT(3))

regards,
dan carpenter

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/4] Staging: vme: Use BIT macro for bit field definitions.
  2016-11-10 19:17   ` Dan Carpenter
@ 2016-11-14 14:46     ` Greg KH
  0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2016-11-14 14:46 UTC (permalink / raw)
  To: Dan Carpenter; +Cc: Anton Leshchenko, devel, linux-kernel

On Thu, Nov 10, 2016 at 10:17:23PM +0300, Dan Carpenter wrote:
> On Wed, Nov 02, 2016 at 01:27:09AM +0300, Anton Leshchenko wrote:
> >  #define PIO2_CNTR_MODE0			0
> > -#define PIO2_CNTR_MODE1			(1 << 1)
> > -#define PIO2_CNTR_MODE2			(2 << 1)
> > -#define PIO2_CNTR_MODE3			(3 << 1)
> > -#define PIO2_CNTR_MODE4			(4 << 1)
> > -#define PIO2_CNTR_MODE5			(5 << 1)
> > +#define PIO2_CNTR_MODE1			BIT(1)
> > +#define PIO2_CNTR_MODE2			BIT(2)
> > +#define PIO2_CNTR_MODE3			(BIT(1) | BIT(2))
> > +#define PIO2_CNTR_MODE4			BIT(4)
> 
> This should be BIT(3)

Ugh, there were other parts wrong with this now that I look closer.
I've now reverted it.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 3/4] Staging: vme: Add required identifier names.
  2016-11-01 22:27 [PATCH 1/4] Staging: vme: Remove excessive blank lines Anton Leshchenko
  2016-11-01 22:27 ` [PATCH 2/4] Staging: vme: Use BIT macro for bit field definitions Anton Leshchenko
@ 2016-11-01 22:27 ` Anton Leshchenko
  2016-11-01 22:27 ` [PATCH 4/4] Staging: vme: Fix parenthesis alignment Anton Leshchenko
  2 siblings, 0 replies; 6+ messages in thread
From: Anton Leshchenko @ 2016-11-01 22:27 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel, Anton Leshchenko

Add identifier names for function definition arguments.

Signed-off-by: Anton Leshchenko <antonl1911@gmail.com>
---
 drivers/staging/vme/devices/vme_pio2.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/vme/devices/vme_pio2.h b/drivers/staging/vme/devices/vme_pio2.h
index 9da3813..e69e15c 100644
--- a/drivers/staging/vme/devices/vme_pio2.h
+++ b/drivers/staging/vme/devices/vme_pio2.h
@@ -235,10 +235,10 @@ struct pio2_card {
 	struct pio2_cntr cntr[6];
 };
 
-int pio2_cntr_reset(struct pio2_card *);
+int pio2_cntr_reset(struct pio2_card *card);
 
-int pio2_gpio_reset(struct pio2_card *);
-int pio2_gpio_init(struct pio2_card *);
-void pio2_gpio_exit(struct pio2_card *);
+int pio2_gpio_reset(struct pio2_card *card);
+int pio2_gpio_init(struct pio2_card *card);
+void pio2_gpio_exit(struct pio2_card *card);
 
 #endif /* _VME_PIO2_H_ */
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 4/4] Staging: vme: Fix parenthesis alignment.
  2016-11-01 22:27 [PATCH 1/4] Staging: vme: Remove excessive blank lines Anton Leshchenko
  2016-11-01 22:27 ` [PATCH 2/4] Staging: vme: Use BIT macro for bit field definitions Anton Leshchenko
  2016-11-01 22:27 ` [PATCH 3/4] Staging: vme: Add required identifier names Anton Leshchenko
@ 2016-11-01 22:27 ` Anton Leshchenko
  2 siblings, 0 replies; 6+ messages in thread
From: Anton Leshchenko @ 2016-11-01 22:27 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel, Anton Leshchenko

Align broken line for code readability.

Signed-off-by: Anton Leshchenko <antonl1911@gmail.com>
---
 drivers/staging/vme/devices/vme_pio2_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
index 8e66a52..20a2d83 100644
--- a/drivers/staging/vme/devices/vme_pio2_core.c
+++ b/drivers/staging/vme/devices/vme_pio2_core.c
@@ -365,7 +365,7 @@ static int pio2_probe(struct vme_dev *vdev)
 		vec = card->irq_vector | PIO2_VECTOR_CNTR[i];
 
 		retval = vme_irq_request(vdev, card->irq_level, vec,
-			&pio2_int, card);
+					 &pio2_int, card);
 		if (retval < 0) {
 			dev_err(&card->vdev->dev,
 				"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-11-14 14:46 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-01 22:27 [PATCH 1/4] Staging: vme: Remove excessive blank lines Anton Leshchenko
2016-11-01 22:27 ` [PATCH 2/4] Staging: vme: Use BIT macro for bit field definitions Anton Leshchenko
2016-11-10 19:17   ` Dan Carpenter
2016-11-14 14:46     ` Greg KH
2016-11-01 22:27 ` [PATCH 3/4] Staging: vme: Add required identifier names Anton Leshchenko
2016-11-01 22:27 ` [PATCH 4/4] Staging: vme: Fix parenthesis alignment Anton Leshchenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox