public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drivers: staging: vme: Fixed code style issues
@ 2015-11-08 20:39 Egor Uleyskiy
  2015-11-08 21:24 ` Greg Kroah-Hartman
  2015-11-24 23:27 ` Greg Kroah-Hartman
  0 siblings, 2 replies; 9+ messages in thread
From: Egor Uleyskiy @ 2015-11-08 20:39 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Egor Uleyskiy, Manohar Vanga, Martyn Welch, Trivial Patch Monkey,
	linux-kernel

From: Egor Uleyskiy <egor.ulieiskii@gmail.com>

Signed-off-by: Egor Uleyskiy <egor.ulieiskii@gmail.com>
---
 drivers/staging/vme/devices/vme_pio2_cntr.c |  2 +-
 drivers/staging/vme/devices/vme_pio2_core.c | 20 +++++++++---------
 drivers/staging/vme/devices/vme_pio2_gpio.c | 32 ++++++++++++++---------------
 drivers/staging/vme/devices/vme_user.h      |  2 --
 4 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/drivers/staging/vme/devices/vme_pio2_cntr.c b/drivers/staging/vme/devices/vme_pio2_cntr.c
index 6335471..486c30c 100644
--- a/drivers/staging/vme/devices/vme_pio2_cntr.c
+++ b/drivers/staging/vme/devices/vme_pio2_cntr.c
@@ -61,7 +61,7 @@ int pio2_cntr_reset(struct pio2_card *card)
 	/* Ensure all counter interrupts are cleared */
 	do {
 		retval = vme_master_read(card->window, &reg, 1,
-			PIO2_REGS_INT_STAT_CNTR);
+					 PIO2_REGS_INT_STAT_CNTR);
 		if (retval < 0)
 			return retval;
 	} while (reg != 0);
diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
index 35c6ce5..28a6ab6 100644
--- a/drivers/staging/vme/devices/vme_pio2_core.c
+++ b/drivers/staging/vme/devices/vme_pio2_core.c
@@ -90,7 +90,7 @@ static void pio2_int(int level, int vector, void *ptr)
 	case 4:
 		/* Channels 0 to 7 */
 		retval = vme_master_read(card->window, &reg, 1,
-			PIO2_REGS_INT_STAT[vec - 1]);
+					 PIO2_REGS_INT_STAT[vec - 1]);
 		if (retval < 0) {
 			dev_err(&card->vdev->dev,
 				"Unable to read IRQ status register\n");
@@ -100,8 +100,8 @@ static void pio2_int(int level, int vector, void *ptr)
 			channel = ((vec - 1) * 8) + i;
 			if (reg & PIO2_CHANNEL_BIT[channel])
 				dev_info(&card->vdev->dev,
-					"Interrupt on I/O channel %d\n",
-					channel);
+					 "Interrupt on I/O channel %d\n",
+					 channel);
 		}
 		break;
 	case 5:
@@ -215,7 +215,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	u8 reg;
 	int vec;
 
-	card = kzalloc(sizeof(struct pio2_card), GFP_KERNEL);
+	card = kzalloc(sizeof(*card), GFP_KERNEL);
 	if (!card) {
 		retval = -ENOMEM;
 		goto err_struct;
@@ -289,7 +289,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	}
 
 	retval = vme_master_set(card->window, 1, card->base, 0x10000, VME_A24,
-		(VME_SCT | VME_USER | VME_DATA), VME_D16);
+				(VME_SCT | VME_USER | VME_DATA), VME_D16);
 	if (retval) {
 		dev_err(&card->vdev->dev,
 			"Unable to configure VME master resource\n");
@@ -335,7 +335,7 @@ static int pio2_probe(struct vme_dev *vdev)
 
 	/* Set VME vector */
 	retval = vme_master_write(card->window, &card->irq_vector, 1,
-		PIO2_REGS_VME_VECTOR);
+				  PIO2_REGS_VME_VECTOR);
 	if (retval < 0)
 		return retval;
 
@@ -343,7 +343,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	vec = card->irq_vector | PIO2_VME_VECTOR_SPUR;
 
 	retval = vme_irq_request(vdev, card->irq_level, vec,
-		&pio2_int, (void *)card);
+				 &pio2_int, (void *)card);
 	if (retval < 0) {
 		dev_err(&card->vdev->dev,
 			"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
@@ -356,7 +356,7 @@ static int pio2_probe(struct vme_dev *vdev)
 		vec = card->irq_vector | PIO2_VECTOR_BANK[i];
 
 		retval = vme_irq_request(vdev, card->irq_level, vec,
-			&pio2_int, (void *)card);
+					 &pio2_int, (void *)card);
 		if (retval < 0) {
 			dev_err(&card->vdev->dev,
 				"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
@@ -370,7 +370,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, (void *)card);
+					 &pio2_int, (void *)card);
 		if (retval < 0) {
 			dev_err(&card->vdev->dev,
 				"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
@@ -397,7 +397,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	dev_set_drvdata(&card->vdev->dev, card);
 
 	dev_info(&card->vdev->dev,
-		"PIO2 (variant %s) configured at 0x%lx\n", card->variant,
+		 "PIO2 (variant %s) configured at 0x%lx\n", card->variant,
 		card->base);
 
 	return 0;
diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
index 77901b3..d441ff2 100644
--- a/drivers/staging/vme/devices/vme_pio2_gpio.c
+++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
@@ -37,14 +37,13 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
 	struct pio2_card *card = gpio_to_pio2_card(chip);
 
 	if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
-		(card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
-
+	    (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
 		dev_err(&card->vdev->dev, "Channel not available as input\n");
 		return 0;
 	}
 
 	retval = vme_master_read(card->window, &reg, 1,
-		PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
+				 PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
 	if (retval < 0) {
 		dev_err(&card->vdev->dev, "Unable to read from GPIO\n");
 		return 0;
@@ -67,29 +66,28 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
 	return 0;
 }
 
-static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
-	int value)
+static void pio2_gpio_set(struct gpio_chip *chip,
+			  unsigned int offset, int value)
 {
 	u8 reg;
 	int retval;
 	struct pio2_card *card = gpio_to_pio2_card(chip);
 
 	if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
-		(card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
-
+	    (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
 		dev_err(&card->vdev->dev, "Channel not available as output\n");
 		return;
 	}
 
 	if (value)
 		reg = card->bank[PIO2_CHANNEL_BANK[offset]].value |
-			PIO2_CHANNEL_BIT[offset];
+		      PIO2_CHANNEL_BIT[offset];
 	else
 		reg = card->bank[PIO2_CHANNEL_BANK[offset]].value &
-			~PIO2_CHANNEL_BIT[offset];
+		      ~PIO2_CHANNEL_BIT[offset];
 
 	retval = vme_master_write(card->window, &reg, 1,
-		PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
+				  PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
 	if (retval < 0) {
 		dev_err(&card->vdev->dev, "Unable to write to GPIO\n");
 		return;
@@ -150,7 +148,7 @@ int pio2_gpio_reset(struct pio2_card *card)
 	/* Zero output registers */
 	for (i = 0; i < 4; i++) {
 		retval = vme_master_write(card->window, &data, 1,
-			PIO2_REGS_DATA[i]);
+					  PIO2_REGS_DATA[i]);
 		if (retval < 0)
 			return retval;
 		card->bank[i].value = 0;
@@ -159,12 +157,12 @@ int pio2_gpio_reset(struct pio2_card *card)
 	/* Set input interrupt masks */
 	for (i = 0; i < 4; i++) {
 		retval = vme_master_write(card->window, &data, 1,
-			PIO2_REGS_INT_MASK[i * 2]);
+					  PIO2_REGS_INT_MASK[i * 2]);
 		if (retval < 0)
 			return retval;
 
 		retval = vme_master_write(card->window, &data, 1,
-			PIO2_REGS_INT_MASK[(i * 2) + 1]);
+					  PIO2_REGS_INT_MASK[(i * 2) + 1]);
 		if (retval < 0)
 			return retval;
 
@@ -176,7 +174,7 @@ int pio2_gpio_reset(struct pio2_card *card)
 	for (i = 0; i < 4; i++) {
 		do {
 			retval = vme_master_read(card->window, &data, 1,
-				PIO2_REGS_INT_STAT[i]);
+						 PIO2_REGS_INT_STAT[i]);
 			if (retval < 0)
 				return retval;
 		} while (data != 0);
@@ -192,7 +190,7 @@ int pio2_gpio_init(struct pio2_card *card)
 
 	label = kasprintf(GFP_KERNEL,
 			  "%s@%s", driver_name, dev_name(&card->vdev->dev));
-	if (label == NULL)
+	if (!label)
 		return -ENOMEM;
 
 	card->gc.label = label;
@@ -207,7 +205,7 @@ int pio2_gpio_init(struct pio2_card *card)
 	card->gc.set = pio2_gpio_set;
 
 	/* This function adds a memory mapped GPIO chip */
-	retval = gpiochip_add(&(card->gc));
+	retval = gpiochip_add(&card->gc);
 	if (retval) {
 		dev_err(&card->vdev->dev, "Unable to register GPIO\n");
 		kfree(card->gc.label);
@@ -220,7 +218,7 @@ void pio2_gpio_exit(struct pio2_card *card)
 {
 	const char *label = card->gc.label;
 
-	gpiochip_remove(&(card->gc));
+	gpiochip_remove(&card->gc);
 	kfree(label);
 }
 
diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme/devices/vme_user.h
index b8cc7bc..a6cb756 100644
--- a/drivers/staging/vme/devices/vme_user.h
+++ b/drivers/staging/vme/devices/vme_user.h
@@ -20,7 +20,6 @@ struct vme_master {
 #endif
 } __packed;
 
-
 /*
  * IOCTL Commands and structures
  */
@@ -28,7 +27,6 @@ struct vme_master {
 /* Magic number for use in ioctls */
 #define VME_IOC_MAGIC 0xAE
 
-
 /* VMEbus Slave Window Configuration Structure */
 struct vme_slave {
 	__u32 enable;		/* State of Window */
-- 
2.5.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH] drivers: staging: vme: Fixed code style issues
  2015-11-08 20:39 Egor Uleyskiy
@ 2015-11-08 21:24 ` Greg Kroah-Hartman
  2015-11-24 23:27 ` Greg Kroah-Hartman
  1 sibling, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2015-11-08 21:24 UTC (permalink / raw)
  To: Egor Uleyskiy
  Cc: Manohar Vanga, Martyn Welch, Trivial Patch Monkey, linux-kernel

On Sun, Nov 08, 2015 at 10:39:26PM +0200, Egor Uleyskiy wrote:
> From: Egor Uleyskiy <egor.ulieiskii@gmail.com>
> 
> Signed-off-by: Egor Uleyskiy <egor.ulieiskii@gmail.com>

_what_ code style issues, please be specific.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] drivers: staging: vme: Fixed code style issues
@ 2015-11-13 20:01 Egor Uleyskiy
  2015-11-13 23:04 ` Martyn Welch
  0 siblings, 1 reply; 9+ messages in thread
From: Egor Uleyskiy @ 2015-11-13 20:01 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Egor Uleyskiy, Manohar Vanga, Martyn Welch, Trivial Patch Monkey,
	linux-kernel

From: Egor Uleyskiy <egor.ulieiskii@gmail.com>

* Fixed indention
* Deleted extra empty lines
* Constructions that looks like
    card = kzalloc(sizeof(struct pio2_card), GFP_KERNEL);
  are changed to
    card = kzalloc(sizeof(*card), GFP_KERNEL);

Signed-off-by: Egor Uleyskiy <egor.ulieiskii@gmail.com>
---
 drivers/staging/vme/devices/vme_pio2_cntr.c |  2 +-
 drivers/staging/vme/devices/vme_pio2_core.c | 20 +++++++++---------
 drivers/staging/vme/devices/vme_pio2_gpio.c | 32 ++++++++++++++---------------
 drivers/staging/vme/devices/vme_user.h      |  2 --
 4 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/drivers/staging/vme/devices/vme_pio2_cntr.c b/drivers/staging/vme/devices/vme_pio2_cntr.c
index 6335471..486c30c 100644
--- a/drivers/staging/vme/devices/vme_pio2_cntr.c
+++ b/drivers/staging/vme/devices/vme_pio2_cntr.c
@@ -61,7 +61,7 @@ int pio2_cntr_reset(struct pio2_card *card)
 	/* Ensure all counter interrupts are cleared */
 	do {
 		retval = vme_master_read(card->window, &reg, 1,
-			PIO2_REGS_INT_STAT_CNTR);
+					 PIO2_REGS_INT_STAT_CNTR);
 		if (retval < 0)
 			return retval;
 	} while (reg != 0);
diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
index 35c6ce5..28a6ab6 100644
--- a/drivers/staging/vme/devices/vme_pio2_core.c
+++ b/drivers/staging/vme/devices/vme_pio2_core.c
@@ -90,7 +90,7 @@ static void pio2_int(int level, int vector, void *ptr)
 	case 4:
 		/* Channels 0 to 7 */
 		retval = vme_master_read(card->window, &reg, 1,
-			PIO2_REGS_INT_STAT[vec - 1]);
+					 PIO2_REGS_INT_STAT[vec - 1]);
 		if (retval < 0) {
 			dev_err(&card->vdev->dev,
 				"Unable to read IRQ status register\n");
@@ -100,8 +100,8 @@ static void pio2_int(int level, int vector, void *ptr)
 			channel = ((vec - 1) * 8) + i;
 			if (reg & PIO2_CHANNEL_BIT[channel])
 				dev_info(&card->vdev->dev,
-					"Interrupt on I/O channel %d\n",
-					channel);
+					 "Interrupt on I/O channel %d\n",
+					 channel);
 		}
 		break;
 	case 5:
@@ -215,7 +215,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	u8 reg;
 	int vec;
 
-	card = kzalloc(sizeof(struct pio2_card), GFP_KERNEL);
+	card = kzalloc(sizeof(*card), GFP_KERNEL);
 	if (!card) {
 		retval = -ENOMEM;
 		goto err_struct;
@@ -289,7 +289,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	}
 
 	retval = vme_master_set(card->window, 1, card->base, 0x10000, VME_A24,
-		(VME_SCT | VME_USER | VME_DATA), VME_D16);
+				(VME_SCT | VME_USER | VME_DATA), VME_D16);
 	if (retval) {
 		dev_err(&card->vdev->dev,
 			"Unable to configure VME master resource\n");
@@ -335,7 +335,7 @@ static int pio2_probe(struct vme_dev *vdev)
 
 	/* Set VME vector */
 	retval = vme_master_write(card->window, &card->irq_vector, 1,
-		PIO2_REGS_VME_VECTOR);
+				  PIO2_REGS_VME_VECTOR);
 	if (retval < 0)
 		return retval;
 
@@ -343,7 +343,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	vec = card->irq_vector | PIO2_VME_VECTOR_SPUR;
 
 	retval = vme_irq_request(vdev, card->irq_level, vec,
-		&pio2_int, (void *)card);
+				 &pio2_int, (void *)card);
 	if (retval < 0) {
 		dev_err(&card->vdev->dev,
 			"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
@@ -356,7 +356,7 @@ static int pio2_probe(struct vme_dev *vdev)
 		vec = card->irq_vector | PIO2_VECTOR_BANK[i];
 
 		retval = vme_irq_request(vdev, card->irq_level, vec,
-			&pio2_int, (void *)card);
+					 &pio2_int, (void *)card);
 		if (retval < 0) {
 			dev_err(&card->vdev->dev,
 				"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
@@ -370,7 +370,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, (void *)card);
+					 &pio2_int, (void *)card);
 		if (retval < 0) {
 			dev_err(&card->vdev->dev,
 				"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
@@ -397,7 +397,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	dev_set_drvdata(&card->vdev->dev, card);
 
 	dev_info(&card->vdev->dev,
-		"PIO2 (variant %s) configured at 0x%lx\n", card->variant,
+		 "PIO2 (variant %s) configured at 0x%lx\n", card->variant,
 		card->base);
 
 	return 0;
diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
index 77901b3..d441ff2 100644
--- a/drivers/staging/vme/devices/vme_pio2_gpio.c
+++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
@@ -37,14 +37,13 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
 	struct pio2_card *card = gpio_to_pio2_card(chip);
 
 	if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
-		(card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
-
+	    (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
 		dev_err(&card->vdev->dev, "Channel not available as input\n");
 		return 0;
 	}
 
 	retval = vme_master_read(card->window, &reg, 1,
-		PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
+				 PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
 	if (retval < 0) {
 		dev_err(&card->vdev->dev, "Unable to read from GPIO\n");
 		return 0;
@@ -67,29 +66,28 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
 	return 0;
 }
 
-static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
-	int value)
+static void pio2_gpio_set(struct gpio_chip *chip,
+			  unsigned int offset, int value)
 {
 	u8 reg;
 	int retval;
 	struct pio2_card *card = gpio_to_pio2_card(chip);
 
 	if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
-		(card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
-
+	    (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
 		dev_err(&card->vdev->dev, "Channel not available as output\n");
 		return;
 	}
 
 	if (value)
 		reg = card->bank[PIO2_CHANNEL_BANK[offset]].value |
-			PIO2_CHANNEL_BIT[offset];
+		      PIO2_CHANNEL_BIT[offset];
 	else
 		reg = card->bank[PIO2_CHANNEL_BANK[offset]].value &
-			~PIO2_CHANNEL_BIT[offset];
+		      ~PIO2_CHANNEL_BIT[offset];
 
 	retval = vme_master_write(card->window, &reg, 1,
-		PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
+				  PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
 	if (retval < 0) {
 		dev_err(&card->vdev->dev, "Unable to write to GPIO\n");
 		return;
@@ -150,7 +148,7 @@ int pio2_gpio_reset(struct pio2_card *card)
 	/* Zero output registers */
 	for (i = 0; i < 4; i++) {
 		retval = vme_master_write(card->window, &data, 1,
-			PIO2_REGS_DATA[i]);
+					  PIO2_REGS_DATA[i]);
 		if (retval < 0)
 			return retval;
 		card->bank[i].value = 0;
@@ -159,12 +157,12 @@ int pio2_gpio_reset(struct pio2_card *card)
 	/* Set input interrupt masks */
 	for (i = 0; i < 4; i++) {
 		retval = vme_master_write(card->window, &data, 1,
-			PIO2_REGS_INT_MASK[i * 2]);
+					  PIO2_REGS_INT_MASK[i * 2]);
 		if (retval < 0)
 			return retval;
 
 		retval = vme_master_write(card->window, &data, 1,
-			PIO2_REGS_INT_MASK[(i * 2) + 1]);
+					  PIO2_REGS_INT_MASK[(i * 2) + 1]);
 		if (retval < 0)
 			return retval;
 
@@ -176,7 +174,7 @@ int pio2_gpio_reset(struct pio2_card *card)
 	for (i = 0; i < 4; i++) {
 		do {
 			retval = vme_master_read(card->window, &data, 1,
-				PIO2_REGS_INT_STAT[i]);
+						 PIO2_REGS_INT_STAT[i]);
 			if (retval < 0)
 				return retval;
 		} while (data != 0);
@@ -192,7 +190,7 @@ int pio2_gpio_init(struct pio2_card *card)
 
 	label = kasprintf(GFP_KERNEL,
 			  "%s@%s", driver_name, dev_name(&card->vdev->dev));
-	if (label == NULL)
+	if (!label)
 		return -ENOMEM;
 
 	card->gc.label = label;
@@ -207,7 +205,7 @@ int pio2_gpio_init(struct pio2_card *card)
 	card->gc.set = pio2_gpio_set;
 
 	/* This function adds a memory mapped GPIO chip */
-	retval = gpiochip_add(&(card->gc));
+	retval = gpiochip_add(&card->gc);
 	if (retval) {
 		dev_err(&card->vdev->dev, "Unable to register GPIO\n");
 		kfree(card->gc.label);
@@ -220,7 +218,7 @@ void pio2_gpio_exit(struct pio2_card *card)
 {
 	const char *label = card->gc.label;
 
-	gpiochip_remove(&(card->gc));
+	gpiochip_remove(&card->gc);
 	kfree(label);
 }
 
diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme/devices/vme_user.h
index b8cc7bc..a6cb756 100644
--- a/drivers/staging/vme/devices/vme_user.h
+++ b/drivers/staging/vme/devices/vme_user.h
@@ -20,7 +20,6 @@ struct vme_master {
 #endif
 } __packed;
 
-
 /*
  * IOCTL Commands and structures
  */
@@ -28,7 +27,6 @@ struct vme_master {
 /* Magic number for use in ioctls */
 #define VME_IOC_MAGIC 0xAE
 
-
 /* VMEbus Slave Window Configuration Structure */
 struct vme_slave {
 	__u32 enable;		/* State of Window */
-- 
2.5.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH] drivers: staging: vme: Fixed code style issues
  2015-11-13 20:01 Egor Uleyskiy
@ 2015-11-13 23:04 ` Martyn Welch
  2015-11-24 23:29   ` Greg Kroah-Hartman
  0 siblings, 1 reply; 9+ messages in thread
From: Martyn Welch @ 2015-11-13 23:04 UTC (permalink / raw)
  To: Egor Uleyskiy, Greg Kroah-Hartman
  Cc: Manohar Vanga, Trivial Patch Monkey, linux-kernel



On 13/11/15 20:01, Egor Uleyskiy wrote:
> From: Egor Uleyskiy <egor.ulieiskii@gmail.com>
>
> * Fixed indention
> * Deleted extra empty lines
> * Constructions that looks like
>      card = kzalloc(sizeof(struct pio2_card), GFP_KERNEL);
>    are changed to
>      card = kzalloc(sizeof(*card), GFP_KERNEL);
Also:

  * Removing extra bracketing from uses of the address operator
  * Use preferred null return check style

Other than that:

Acked-by: Martyn Welch <martyn@welchs.me.uk>

Martyn

>
> Signed-off-by: Egor Uleyskiy <egor.ulieiskii@gmail.com>
> ---
>   drivers/staging/vme/devices/vme_pio2_cntr.c |  2 +-
>   drivers/staging/vme/devices/vme_pio2_core.c | 20 +++++++++---------
>   drivers/staging/vme/devices/vme_pio2_gpio.c | 32 ++++++++++++++---------------
>   drivers/staging/vme/devices/vme_user.h      |  2 --
>   4 files changed, 26 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/staging/vme/devices/vme_pio2_cntr.c b/drivers/staging/vme/devices/vme_pio2_cntr.c
> index 6335471..486c30c 100644
> --- a/drivers/staging/vme/devices/vme_pio2_cntr.c
> +++ b/drivers/staging/vme/devices/vme_pio2_cntr.c
> @@ -61,7 +61,7 @@ int pio2_cntr_reset(struct pio2_card *card)
>   	/* Ensure all counter interrupts are cleared */
>   	do {
>   		retval = vme_master_read(card->window, &reg, 1,
> -			PIO2_REGS_INT_STAT_CNTR);
> +					 PIO2_REGS_INT_STAT_CNTR);
>   		if (retval < 0)
>   			return retval;
>   	} while (reg != 0);
> diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
> index 35c6ce5..28a6ab6 100644
> --- a/drivers/staging/vme/devices/vme_pio2_core.c
> +++ b/drivers/staging/vme/devices/vme_pio2_core.c
> @@ -90,7 +90,7 @@ static void pio2_int(int level, int vector, void *ptr)
>   	case 4:
>   		/* Channels 0 to 7 */
>   		retval = vme_master_read(card->window, &reg, 1,
> -			PIO2_REGS_INT_STAT[vec - 1]);
> +					 PIO2_REGS_INT_STAT[vec - 1]);
>   		if (retval < 0) {
>   			dev_err(&card->vdev->dev,
>   				"Unable to read IRQ status register\n");
> @@ -100,8 +100,8 @@ static void pio2_int(int level, int vector, void *ptr)
>   			channel = ((vec - 1) * 8) + i;
>   			if (reg & PIO2_CHANNEL_BIT[channel])
>   				dev_info(&card->vdev->dev,
> -					"Interrupt on I/O channel %d\n",
> -					channel);
> +					 "Interrupt on I/O channel %d\n",
> +					 channel);
>   		}
>   		break;
>   	case 5:
> @@ -215,7 +215,7 @@ static int pio2_probe(struct vme_dev *vdev)
>   	u8 reg;
>   	int vec;
>   
> -	card = kzalloc(sizeof(struct pio2_card), GFP_KERNEL);
> +	card = kzalloc(sizeof(*card), GFP_KERNEL);
>   	if (!card) {
>   		retval = -ENOMEM;
>   		goto err_struct;
> @@ -289,7 +289,7 @@ static int pio2_probe(struct vme_dev *vdev)
>   	}
>   
>   	retval = vme_master_set(card->window, 1, card->base, 0x10000, VME_A24,
> -		(VME_SCT | VME_USER | VME_DATA), VME_D16);
> +				(VME_SCT | VME_USER | VME_DATA), VME_D16);
>   	if (retval) {
>   		dev_err(&card->vdev->dev,
>   			"Unable to configure VME master resource\n");
> @@ -335,7 +335,7 @@ static int pio2_probe(struct vme_dev *vdev)
>   
>   	/* Set VME vector */
>   	retval = vme_master_write(card->window, &card->irq_vector, 1,
> -		PIO2_REGS_VME_VECTOR);
> +				  PIO2_REGS_VME_VECTOR);
>   	if (retval < 0)
>   		return retval;
>   
> @@ -343,7 +343,7 @@ static int pio2_probe(struct vme_dev *vdev)
>   	vec = card->irq_vector | PIO2_VME_VECTOR_SPUR;
>   
>   	retval = vme_irq_request(vdev, card->irq_level, vec,
> -		&pio2_int, (void *)card);
> +				 &pio2_int, (void *)card);
>   	if (retval < 0) {
>   		dev_err(&card->vdev->dev,
>   			"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
> @@ -356,7 +356,7 @@ static int pio2_probe(struct vme_dev *vdev)
>   		vec = card->irq_vector | PIO2_VECTOR_BANK[i];
>   
>   		retval = vme_irq_request(vdev, card->irq_level, vec,
> -			&pio2_int, (void *)card);
> +					 &pio2_int, (void *)card);
>   		if (retval < 0) {
>   			dev_err(&card->vdev->dev,
>   				"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
> @@ -370,7 +370,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, (void *)card);
> +					 &pio2_int, (void *)card);
>   		if (retval < 0) {
>   			dev_err(&card->vdev->dev,
>   				"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
> @@ -397,7 +397,7 @@ static int pio2_probe(struct vme_dev *vdev)
>   	dev_set_drvdata(&card->vdev->dev, card);
>   
>   	dev_info(&card->vdev->dev,
> -		"PIO2 (variant %s) configured at 0x%lx\n", card->variant,
> +		 "PIO2 (variant %s) configured at 0x%lx\n", card->variant,
>   		card->base);
>   
>   	return 0;
> diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
> index 77901b3..d441ff2 100644
> --- a/drivers/staging/vme/devices/vme_pio2_gpio.c
> +++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
> @@ -37,14 +37,13 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
>   	struct pio2_card *card = gpio_to_pio2_card(chip);
>   
>   	if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
> -		(card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
> -
> +	    (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
>   		dev_err(&card->vdev->dev, "Channel not available as input\n");
>   		return 0;
>   	}
>   
>   	retval = vme_master_read(card->window, &reg, 1,
> -		PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
> +				 PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
>   	if (retval < 0) {
>   		dev_err(&card->vdev->dev, "Unable to read from GPIO\n");
>   		return 0;
> @@ -67,29 +66,28 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
>   	return 0;
>   }
>   
> -static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
> -	int value)
> +static void pio2_gpio_set(struct gpio_chip *chip,
> +			  unsigned int offset, int value)
>   {
>   	u8 reg;
>   	int retval;
>   	struct pio2_card *card = gpio_to_pio2_card(chip);
>   
>   	if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
> -		(card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
> -
> +	    (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
>   		dev_err(&card->vdev->dev, "Channel not available as output\n");
>   		return;
>   	}
>   
>   	if (value)
>   		reg = card->bank[PIO2_CHANNEL_BANK[offset]].value |
> -			PIO2_CHANNEL_BIT[offset];
> +		      PIO2_CHANNEL_BIT[offset];
>   	else
>   		reg = card->bank[PIO2_CHANNEL_BANK[offset]].value &
> -			~PIO2_CHANNEL_BIT[offset];
> +		      ~PIO2_CHANNEL_BIT[offset];
>   
>   	retval = vme_master_write(card->window, &reg, 1,
> -		PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
> +				  PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
>   	if (retval < 0) {
>   		dev_err(&card->vdev->dev, "Unable to write to GPIO\n");
>   		return;
> @@ -150,7 +148,7 @@ int pio2_gpio_reset(struct pio2_card *card)
>   	/* Zero output registers */
>   	for (i = 0; i < 4; i++) {
>   		retval = vme_master_write(card->window, &data, 1,
> -			PIO2_REGS_DATA[i]);
> +					  PIO2_REGS_DATA[i]);
>   		if (retval < 0)
>   			return retval;
>   		card->bank[i].value = 0;
> @@ -159,12 +157,12 @@ int pio2_gpio_reset(struct pio2_card *card)
>   	/* Set input interrupt masks */
>   	for (i = 0; i < 4; i++) {
>   		retval = vme_master_write(card->window, &data, 1,
> -			PIO2_REGS_INT_MASK[i * 2]);
> +					  PIO2_REGS_INT_MASK[i * 2]);
>   		if (retval < 0)
>   			return retval;
>   
>   		retval = vme_master_write(card->window, &data, 1,
> -			PIO2_REGS_INT_MASK[(i * 2) + 1]);
> +					  PIO2_REGS_INT_MASK[(i * 2) + 1]);
>   		if (retval < 0)
>   			return retval;
>   
> @@ -176,7 +174,7 @@ int pio2_gpio_reset(struct pio2_card *card)
>   	for (i = 0; i < 4; i++) {
>   		do {
>   			retval = vme_master_read(card->window, &data, 1,
> -				PIO2_REGS_INT_STAT[i]);
> +						 PIO2_REGS_INT_STAT[i]);
>   			if (retval < 0)
>   				return retval;
>   		} while (data != 0);
> @@ -192,7 +190,7 @@ int pio2_gpio_init(struct pio2_card *card)
>   
>   	label = kasprintf(GFP_KERNEL,
>   			  "%s@%s", driver_name, dev_name(&card->vdev->dev));
> -	if (label == NULL)
> +	if (!label)
>   		return -ENOMEM;
>   
>   	card->gc.label = label;
> @@ -207,7 +205,7 @@ int pio2_gpio_init(struct pio2_card *card)
>   	card->gc.set = pio2_gpio_set;
>   
>   	/* This function adds a memory mapped GPIO chip */
> -	retval = gpiochip_add(&(card->gc));
> +	retval = gpiochip_add(&card->gc);
>   	if (retval) {
>   		dev_err(&card->vdev->dev, "Unable to register GPIO\n");
>   		kfree(card->gc.label);
> @@ -220,7 +218,7 @@ void pio2_gpio_exit(struct pio2_card *card)
>   {
>   	const char *label = card->gc.label;
>   
> -	gpiochip_remove(&(card->gc));
> +	gpiochip_remove(&card->gc);
>   	kfree(label);
>   }
>   
> diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme/devices/vme_user.h
> index b8cc7bc..a6cb756 100644
> --- a/drivers/staging/vme/devices/vme_user.h
> +++ b/drivers/staging/vme/devices/vme_user.h
> @@ -20,7 +20,6 @@ struct vme_master {
>   #endif
>   } __packed;
>   
> -
>   /*
>    * IOCTL Commands and structures
>    */
> @@ -28,7 +27,6 @@ struct vme_master {
>   /* Magic number for use in ioctls */
>   #define VME_IOC_MAGIC 0xAE
>   
> -
>   /* VMEbus Slave Window Configuration Structure */
>   struct vme_slave {
>   	__u32 enable;		/* State of Window */


^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] drivers: staging: vme: Fixed code style issues
@ 2015-11-21 21:26 Egor Uleyskiy
  2015-11-21 21:38 ` Joe Perches
  0 siblings, 1 reply; 9+ messages in thread
From: Egor Uleyskiy @ 2015-11-21 21:26 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Egor Uleyskiy, Manohar Vanga, Martyn Welch, Trivial Patch Monkey,
	linux-kernel

From: Egor Uleyskiy <egor.ulieiskii@gmail.com>

* Fixed indention
* Deleted extra empty lines
* Constructions that looks like
    card = kzalloc(sizeof(struct pio2_card), GFP_KERNEL);
  are changed to
    card = kzalloc(sizeof(*card), GFP_KERNEL);

Signed-off-by: Egor Uleyskiy <egor.ulieiskii@gmail.com>
---
 drivers/staging/vme/devices/vme_pio2_cntr.c |  2 +-
 drivers/staging/vme/devices/vme_pio2_core.c | 20 +++++++++---------
 drivers/staging/vme/devices/vme_pio2_gpio.c | 32 ++++++++++++++---------------
 drivers/staging/vme/devices/vme_user.h      |  2 --
 4 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/drivers/staging/vme/devices/vme_pio2_cntr.c b/drivers/staging/vme/devices/vme_pio2_cntr.c
index 6335471..486c30c 100644
--- a/drivers/staging/vme/devices/vme_pio2_cntr.c
+++ b/drivers/staging/vme/devices/vme_pio2_cntr.c
@@ -61,7 +61,7 @@ int pio2_cntr_reset(struct pio2_card *card)
 	/* Ensure all counter interrupts are cleared */
 	do {
 		retval = vme_master_read(card->window, &reg, 1,
-			PIO2_REGS_INT_STAT_CNTR);
+					 PIO2_REGS_INT_STAT_CNTR);
 		if (retval < 0)
 			return retval;
 	} while (reg != 0);
diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
index 35c6ce5..28a6ab6 100644
--- a/drivers/staging/vme/devices/vme_pio2_core.c
+++ b/drivers/staging/vme/devices/vme_pio2_core.c
@@ -90,7 +90,7 @@ static void pio2_int(int level, int vector, void *ptr)
 	case 4:
 		/* Channels 0 to 7 */
 		retval = vme_master_read(card->window, &reg, 1,
-			PIO2_REGS_INT_STAT[vec - 1]);
+					 PIO2_REGS_INT_STAT[vec - 1]);
 		if (retval < 0) {
 			dev_err(&card->vdev->dev,
 				"Unable to read IRQ status register\n");
@@ -100,8 +100,8 @@ static void pio2_int(int level, int vector, void *ptr)
 			channel = ((vec - 1) * 8) + i;
 			if (reg & PIO2_CHANNEL_BIT[channel])
 				dev_info(&card->vdev->dev,
-					"Interrupt on I/O channel %d\n",
-					channel);
+					 "Interrupt on I/O channel %d\n",
+					 channel);
 		}
 		break;
 	case 5:
@@ -215,7 +215,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	u8 reg;
 	int vec;
 
-	card = kzalloc(sizeof(struct pio2_card), GFP_KERNEL);
+	card = kzalloc(sizeof(*card), GFP_KERNEL);
 	if (!card) {
 		retval = -ENOMEM;
 		goto err_struct;
@@ -289,7 +289,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	}
 
 	retval = vme_master_set(card->window, 1, card->base, 0x10000, VME_A24,
-		(VME_SCT | VME_USER | VME_DATA), VME_D16);
+				(VME_SCT | VME_USER | VME_DATA), VME_D16);
 	if (retval) {
 		dev_err(&card->vdev->dev,
 			"Unable to configure VME master resource\n");
@@ -335,7 +335,7 @@ static int pio2_probe(struct vme_dev *vdev)
 
 	/* Set VME vector */
 	retval = vme_master_write(card->window, &card->irq_vector, 1,
-		PIO2_REGS_VME_VECTOR);
+				  PIO2_REGS_VME_VECTOR);
 	if (retval < 0)
 		return retval;
 
@@ -343,7 +343,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	vec = card->irq_vector | PIO2_VME_VECTOR_SPUR;
 
 	retval = vme_irq_request(vdev, card->irq_level, vec,
-		&pio2_int, (void *)card);
+				 &pio2_int, (void *)card);
 	if (retval < 0) {
 		dev_err(&card->vdev->dev,
 			"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
@@ -356,7 +356,7 @@ static int pio2_probe(struct vme_dev *vdev)
 		vec = card->irq_vector | PIO2_VECTOR_BANK[i];
 
 		retval = vme_irq_request(vdev, card->irq_level, vec,
-			&pio2_int, (void *)card);
+					 &pio2_int, (void *)card);
 		if (retval < 0) {
 			dev_err(&card->vdev->dev,
 				"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
@@ -370,7 +370,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, (void *)card);
+					 &pio2_int, (void *)card);
 		if (retval < 0) {
 			dev_err(&card->vdev->dev,
 				"Unable to attach VME interrupt vector0x%x, level 0x%x\n",
@@ -397,7 +397,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	dev_set_drvdata(&card->vdev->dev, card);
 
 	dev_info(&card->vdev->dev,
-		"PIO2 (variant %s) configured at 0x%lx\n", card->variant,
+		 "PIO2 (variant %s) configured at 0x%lx\n", card->variant,
 		card->base);
 
 	return 0;
diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
index 77901b3..d441ff2 100644
--- a/drivers/staging/vme/devices/vme_pio2_gpio.c
+++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
@@ -37,14 +37,13 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
 	struct pio2_card *card = gpio_to_pio2_card(chip);
 
 	if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
-		(card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
-
+	    (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
 		dev_err(&card->vdev->dev, "Channel not available as input\n");
 		return 0;
 	}
 
 	retval = vme_master_read(card->window, &reg, 1,
-		PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
+				 PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
 	if (retval < 0) {
 		dev_err(&card->vdev->dev, "Unable to read from GPIO\n");
 		return 0;
@@ -67,29 +66,28 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
 	return 0;
 }
 
-static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
-	int value)
+static void pio2_gpio_set(struct gpio_chip *chip,
+			  unsigned int offset, int value)
 {
 	u8 reg;
 	int retval;
 	struct pio2_card *card = gpio_to_pio2_card(chip);
 
 	if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
-		(card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
-
+	    (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
 		dev_err(&card->vdev->dev, "Channel not available as output\n");
 		return;
 	}
 
 	if (value)
 		reg = card->bank[PIO2_CHANNEL_BANK[offset]].value |
-			PIO2_CHANNEL_BIT[offset];
+		      PIO2_CHANNEL_BIT[offset];
 	else
 		reg = card->bank[PIO2_CHANNEL_BANK[offset]].value &
-			~PIO2_CHANNEL_BIT[offset];
+		      ~PIO2_CHANNEL_BIT[offset];
 
 	retval = vme_master_write(card->window, &reg, 1,
-		PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
+				  PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
 	if (retval < 0) {
 		dev_err(&card->vdev->dev, "Unable to write to GPIO\n");
 		return;
@@ -150,7 +148,7 @@ int pio2_gpio_reset(struct pio2_card *card)
 	/* Zero output registers */
 	for (i = 0; i < 4; i++) {
 		retval = vme_master_write(card->window, &data, 1,
-			PIO2_REGS_DATA[i]);
+					  PIO2_REGS_DATA[i]);
 		if (retval < 0)
 			return retval;
 		card->bank[i].value = 0;
@@ -159,12 +157,12 @@ int pio2_gpio_reset(struct pio2_card *card)
 	/* Set input interrupt masks */
 	for (i = 0; i < 4; i++) {
 		retval = vme_master_write(card->window, &data, 1,
-			PIO2_REGS_INT_MASK[i * 2]);
+					  PIO2_REGS_INT_MASK[i * 2]);
 		if (retval < 0)
 			return retval;
 
 		retval = vme_master_write(card->window, &data, 1,
-			PIO2_REGS_INT_MASK[(i * 2) + 1]);
+					  PIO2_REGS_INT_MASK[(i * 2) + 1]);
 		if (retval < 0)
 			return retval;
 
@@ -176,7 +174,7 @@ int pio2_gpio_reset(struct pio2_card *card)
 	for (i = 0; i < 4; i++) {
 		do {
 			retval = vme_master_read(card->window, &data, 1,
-				PIO2_REGS_INT_STAT[i]);
+						 PIO2_REGS_INT_STAT[i]);
 			if (retval < 0)
 				return retval;
 		} while (data != 0);
@@ -192,7 +190,7 @@ int pio2_gpio_init(struct pio2_card *card)
 
 	label = kasprintf(GFP_KERNEL,
 			  "%s@%s", driver_name, dev_name(&card->vdev->dev));
-	if (label == NULL)
+	if (!label)
 		return -ENOMEM;
 
 	card->gc.label = label;
@@ -207,7 +205,7 @@ int pio2_gpio_init(struct pio2_card *card)
 	card->gc.set = pio2_gpio_set;
 
 	/* This function adds a memory mapped GPIO chip */
-	retval = gpiochip_add(&(card->gc));
+	retval = gpiochip_add(&card->gc);
 	if (retval) {
 		dev_err(&card->vdev->dev, "Unable to register GPIO\n");
 		kfree(card->gc.label);
@@ -220,7 +218,7 @@ void pio2_gpio_exit(struct pio2_card *card)
 {
 	const char *label = card->gc.label;
 
-	gpiochip_remove(&(card->gc));
+	gpiochip_remove(&card->gc);
 	kfree(label);
 }
 
diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme/devices/vme_user.h
index b8cc7bc..a6cb756 100644
--- a/drivers/staging/vme/devices/vme_user.h
+++ b/drivers/staging/vme/devices/vme_user.h
@@ -20,7 +20,6 @@ struct vme_master {
 #endif
 } __packed;
 
-
 /*
  * IOCTL Commands and structures
  */
@@ -28,7 +27,6 @@ struct vme_master {
 /* Magic number for use in ioctls */
 #define VME_IOC_MAGIC 0xAE
 
-
 /* VMEbus Slave Window Configuration Structure */
 struct vme_slave {
 	__u32 enable;		/* State of Window */
-- 
2.5.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH] drivers: staging: vme: Fixed code style issues
  2015-11-21 21:26 [PATCH] drivers: staging: vme: Fixed code style issues Egor Uleyskiy
@ 2015-11-21 21:38 ` Joe Perches
  2015-11-24 23:29   ` Greg Kroah-Hartman
  0 siblings, 1 reply; 9+ messages in thread
From: Joe Perches @ 2015-11-21 21:38 UTC (permalink / raw)
  To: Egor Uleyskiy, Greg Kroah-Hartman
  Cc: Manohar Vanga, Martyn Welch, Trivial Patch Monkey, linux-kernel

On Sat, 2015-11-21 at 23:26 +0200, Egor Uleyskiy wrote:

trivia:
Some might consider this patch fixes too many issues in
one patch and should be broken up into a patch series.

> > diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
[]
>  	retval = vme_master_set(card->window, 1, card->base, 0x10000, VME_A24,
> -		(VME_SCT | VME_USER | VME_DATA), VME_D16);
> +				(VME_SCT | VME_USER | VME_DATA), VME_D16);

unnecessary parentheses around VME_ constants
> @@ -343,7 +343,7 @@ static int pio2_probe(struct vme_dev *vdev)
>  	retval = vme_irq_request(vdev, card->irq_level, vec,
> -		&pio2_int, (void *)card);
> +				 &pio2_int, (void *)card);

unnecessary cast to (void *) here and in other places.

You could fix these in follow-on patch(es) or revisions
like a patch set of this one.


^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] drivers: staging: vme: Fixed code style issues
  2015-11-08 20:39 Egor Uleyskiy
  2015-11-08 21:24 ` Greg Kroah-Hartman
@ 2015-11-24 23:27 ` Greg Kroah-Hartman
  1 sibling, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2015-11-24 23:27 UTC (permalink / raw)
  To: Egor Uleyskiy
  Cc: Manohar Vanga, Martyn Welch, Trivial Patch Monkey, linux-kernel

On Sun, Nov 08, 2015 at 10:39:26PM +0200, Egor Uleyskiy wrote:
> From: Egor Uleyskiy <egor.ulieiskii@gmail.com>

What code style issues?  Please be specific and detailed.  Please fix
this up and resend.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] drivers: staging: vme: Fixed code style issues
  2015-11-13 23:04 ` Martyn Welch
@ 2015-11-24 23:29   ` Greg Kroah-Hartman
  0 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2015-11-24 23:29 UTC (permalink / raw)
  To: Martyn Welch
  Cc: Egor Uleyskiy, Manohar Vanga, Trivial Patch Monkey, linux-kernel

On Fri, Nov 13, 2015 at 11:04:08PM +0000, Martyn Welch wrote:
> 
> 
> On 13/11/15 20:01, Egor Uleyskiy wrote:
> >From: Egor Uleyskiy <egor.ulieiskii@gmail.com>
> >
> >* Fixed indention
> >* Deleted extra empty lines
> >* Constructions that looks like
> >     card = kzalloc(sizeof(struct pio2_card), GFP_KERNEL);
> >   are changed to
> >     card = kzalloc(sizeof(*card), GFP_KERNEL);
> Also:
> 
>  * Removing extra bracketing from uses of the address operator
>  * Use preferred null return check style

Ick, not good, please break this up into individual patches,
one-per-type-of-fix.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] drivers: staging: vme: Fixed code style issues
  2015-11-21 21:38 ` Joe Perches
@ 2015-11-24 23:29   ` Greg Kroah-Hartman
  0 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2015-11-24 23:29 UTC (permalink / raw)
  To: Joe Perches
  Cc: Egor Uleyskiy, Manohar Vanga, Martyn Welch, Trivial Patch Monkey,
	linux-kernel

On Sat, Nov 21, 2015 at 01:38:13PM -0800, Joe Perches wrote:
> On Sat, 2015-11-21 at 23:26 +0200, Egor Uleyskiy wrote:
> 
> trivia:
> Some might consider this patch fixes too many issues in
> one patch and should be broken up into a patch series.

Yes, like me, Egor, please fix up and resend.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-11-24 23:29 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-21 21:26 [PATCH] drivers: staging: vme: Fixed code style issues Egor Uleyskiy
2015-11-21 21:38 ` Joe Perches
2015-11-24 23:29   ` Greg Kroah-Hartman
  -- strict thread matches above, loose matches on Subject: below --
2015-11-13 20:01 Egor Uleyskiy
2015-11-13 23:04 ` Martyn Welch
2015-11-24 23:29   ` Greg Kroah-Hartman
2015-11-08 20:39 Egor Uleyskiy
2015-11-08 21:24 ` Greg Kroah-Hartman
2015-11-24 23:27 ` Greg Kroah-Hartman

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