[PATCH] staging: pi433: pi433_if.c: fix if/else if and brace coding style issues

2017-11-14 Thread Chase Metzger
Fix if/else if and braces in function DIO0_irq_handler to comply with
the kernel coding style.

Signed-off-by: Chase Metzger 
---
 drivers/staging/pi433/pi433_if.c | 11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index d946838450d4..dee70c47629c 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -133,19 +133,14 @@ static irqreturn_t DIO0_irq_handler(int irq, void *dev_id)
 {
struct pi433_device *device = dev_id;
 
-   if  (device->irq_state[DIO0] == DIO_PacketSent)
-   {
+   if  (device->irq_state[DIO0] == DIO_PacketSent) {
device->free_in_fifo = FIFO_SIZE;
dev_dbg(device->dev, "DIO0 irq: Packet sent\n");
wake_up_interruptible(&device->fifo_wait_queue);
-   }
-   else if (device->irq_state[DIO0] == DIO_Rssi_DIO0)
-   {
+   } else if (device->irq_state[DIO0] == DIO_Rssi_DIO0) {
dev_dbg(device->dev, "DIO0 irq: RSSI level over threshold\n");
wake_up_interruptible(&device->rx_wait_queue);
-   }
-   else if (device->irq_state[DIO0] == DIO_PayloadReady)
-   {
+   } else if (device->irq_state[DIO0] == DIO_PayloadReady) {
dev_dbg(device->dev, "DIO0 irq: PayloadReady\n");
device->free_in_fifo = 0;
wake_up_interruptible(&device->fifo_wait_queue);
-- 
2.11.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 3/6] staging: pi433: pi433_if.c: fix trailing statement coding style issues

2017-11-15 Thread Chase Metzger
Put trailing statement after if/else statements on new line to comply
with the kernel coding style.

Signed-off-by: Chase Metzger 
---
 drivers/staging/pi433/pi433_if.c | 44 +++-
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index cd1430a04928..3c5d8a05e976 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -156,8 +156,10 @@ static irqreturn_t DIO1_irq_handler(int irq, void *dev_id)
if  (device->irq_state[DIO1] == DIO_FifoNotEmpty_DIO1) {
device->free_in_fifo = FIFO_SIZE;
} else if (device->irq_state[DIO1] == DIO_FifoLevel) {
-   if (device->rx_active)  device->free_in_fifo = FIFO_THRESHOLD - 
1;
-   elsedevice->free_in_fifo = FIFO_SIZE - 
FIFO_THRESHOLD - 1;
+   if (device->rx_active)
+   device->free_in_fifo = FIFO_THRESHOLD - 1;
+   else
+   device->free_in_fifo = FIFO_SIZE - FIFO_THRESHOLD - 1;
}
dev_dbg(device->dev,
"DIO1 irq: %d bytes free in fifo\n", device->free_in_fifo);
@@ -213,8 +215,10 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct 
pi433_rx_cfg *rx_cfg)
SET_CHECKED(rf69_set_payload_length(dev->spi, 0xff));
} else if (rx_cfg->fixed_message_length != 0) {
payload_length = rx_cfg->fixed_message_length;
-   if (rx_cfg->enable_length_byte  == optionOn) payload_length++;
-   if (rx_cfg->enable_address_filtering != filteringOff) 
payload_length++;
+   if (rx_cfg->enable_length_byte  == optionOn)
+   payload_length++;
+   if (rx_cfg->enable_address_filtering != filteringOff)
+   payload_length++;
SET_CHECKED(rf69_set_payload_length(dev->spi, payload_length));
} else {
SET_CHECKED(rf69_set_payload_length(dev->spi, 0));
@@ -285,7 +289,8 @@ pi433_start_rx(struct pi433_device *dev)
 
/* setup for receiving */
retval = rf69_set_rx_cfg(dev, &dev->rx_cfg);
-   if (retval) return retval;
+   if (retval)
+   return retval;
 
/* setup rssi irq */
SET_CHECKED(rf69_set_dio_mapping(dev->spi, DIO0, DIO_Rssi_DIO0));
@@ -347,11 +352,13 @@ pi433_receive(void *data)
retval = wait_event_interruptible(dev->rx_wait_queue,
  rf69_get_flag(dev->spi,

rssiExceededThreshold));
-   if (retval) goto abort; /* wait was interrupted */
+   if (retval) /* wait was interrupted */
+   goto abort;
dev->interrupt_rx_allowed = false;
 
/* cross check for ongoing tx */
-   if (!dev->tx_active) break;
+   if (!dev->tx_active)
+   break;
}
 
/* configure payload ready irq */
@@ -376,7 +383,8 @@ pi433_receive(void *data)
if (dev->rx_cfg.enable_length_byte == optionOn) {
retval = wait_event_interruptible(dev->fifo_wait_queue,
  dev->free_in_fifo < 
FIFO_SIZE);
-   if (retval) goto abort; /* wait was interrupted */
+   if (retval) /* wait was interrupted */
+   goto abort;
 
rf69_read_fifo(spi, (u8 *)&bytes_total, 1);
if (bytes_total > dev->rx_buffer_size) {
@@ -395,7 +403,8 @@ pi433_receive(void *data)
 
retval = wait_event_interruptible(dev->fifo_wait_queue,
  dev->free_in_fifo < 
FIFO_SIZE);
-   if (retval) goto abort; /* wait was interrupted */
+   if (retval) /* wait was interrupted */
+   goto abort;
 
rf69_read_fifo(spi, &dummy, 1);
dev->free_in_fifo++;
@@ -407,7 +416,8 @@ pi433_receive(void *data)
if ( !rf69_get_flag(dev->spi, payloadReady) ) {
retval = wait_event_interruptible(dev->fifo_wait_queue,
  dev->free_in_fifo < 
FIFO_SIZE);
-   if (retval) goto abort; /* wait was interrupted */
+   if (retval) /* wait was interrupted */
+   goto abort;
}
 
/* need to drop bytes or acquire? */
@@ -423,7 +433,8 @@ pi433_receive(void *data)
retval = rf69_read_fifo(spi,
&dev->rx_buffer[dev->rx_position],
   

[PATCH 4/6] staging: pi433: pi433_if.c: fix space prohibited coding style issues

2017-11-15 Thread Chase Metzger
Remove unnecessary spaces before and after parenthesis' to comply
with the kernel coding style.

Signed-off-by: Chase Metzger 
---
 drivers/staging/pi433/pi433_if.c | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index 3c5d8a05e976..ad89504655af 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -342,7 +342,7 @@ pi433_receive(void *data)
return retval;
 
/* now check RSSI, if low wait for getting high (RSSI interrupt) */
-   while ( !rf69_get_flag(dev->spi, rssiExceededThreshold) ) {
+   while (!rf69_get_flag(dev->spi, rssiExceededThreshold)) {
/* allow tx to interrupt us while waiting for high RSSI */
dev->interrupt_rx_allowed = true;
wake_up_interruptible(&dev->tx_wait_queue);
@@ -413,7 +413,7 @@ pi433_receive(void *data)
 
/* get payload */
while (dev->rx_position < bytes_total) {
-   if ( !rf69_get_flag(dev->spi, payloadReady) ) {
+   if (!rf69_get_flag(dev->spi, payloadReady)) {
retval = wait_event_interruptible(dev->fifo_wait_queue,
  dev->free_in_fifo < 
FIFO_SIZE);
if (retval) /* wait was interrupted */
@@ -473,9 +473,9 @@ pi433_tx_thread(void *data)
/* wait for fifo to be populated or for request to terminate*/
dev_dbg(device->dev, "thread: going to wait for new messages");
wait_event_interruptible(device->tx_wait_queue,
-( !kfifo_is_empty(&device->tx_fifo) ||
-   kthread_should_stop() ));
-   if ( kthread_should_stop() )
+(!kfifo_is_empty(&device->tx_fifo) ||
+   kthread_should_stop()));
+   if (kthread_should_stop())
return 0;
 
/* get data from fifo in the following order:
@@ -487,14 +487,14 @@ pi433_tx_thread(void *data)
 
retval = kfifo_out(&device->tx_fifo, &tx_cfg, sizeof(tx_cfg));
if (retval != sizeof(tx_cfg)) {
-   dev_dbg(device->dev, "reading tx_cfg from fifo failed: 
got %d byte(s), expected %d", retval, (unsigned int)sizeof(tx_cfg) );
+   dev_dbg(device->dev, "reading tx_cfg from fifo failed: 
got %d byte(s), expected %d", retval, (unsigned int)sizeof(tx_cfg));
mutex_unlock(&device->tx_fifo_lock);
continue;
}
 
retval = kfifo_out(&device->tx_fifo, &size, sizeof(size_t));
if (retval != sizeof(size_t)) {
-   dev_dbg(device->dev, "reading msg size from fifo 
failed: got %d, expected %d", retval, (unsigned int)sizeof(size_t) );
+   dev_dbg(device->dev, "reading msg size from fifo 
failed: got %d, expected %d", retval, (unsigned int)sizeof(size_t));
mutex_unlock(&device->tx_fifo_lock);
continue;
}
@@ -524,7 +524,7 @@ pi433_tx_thread(void *data)
buffer[position++] = tx_cfg.address_byte;
 
/* finally get message data from fifo */
-   retval = kfifo_out(&device->tx_fifo, &buffer[position], 
sizeof(buffer)-position );
+   retval = kfifo_out(&device->tx_fifo, &buffer[position], 
sizeof(buffer)-position);
dev_dbg(device->dev, "read %d message byte(s) from fifo 
queue.", retval);
mutex_unlock(&device->tx_fifo_lock);
 
@@ -582,8 +582,8 @@ pi433_tx_thread(void *data)
device->free_in_fifo = FIFO_SIZE;
position = 0;
repetitions = tx_cfg.repetitions;
-   while( (repetitions > 0) && (size > position) ) {
-   if ( (size - position) > device->free_in_fifo) {
+   while((repetitions > 0) && (size > position)) {
+   if ((size - position) > device->free_in_fifo) {
/* msg to big for fifo - take a part */
int temp = device->free_in_fifo;
device->free_in_fifo = 0;
@@ -597,7 +597,7 @@ pi433_tx_thread(void *data)
repetitions--;
rf69_write_fifo(spi,
&buffer[position],
-   (size - position) );
+ 

[PATCH 5/6] staging: pi433: pi433_if.c: fix space(s) required coding style issues

2017-11-15 Thread Chase Metzger
Put space(s) in required spots to comply with the kernel coding style.

Signed-off-by: Chase Metzger 
---
 drivers/staging/pi433/pi433_if.c | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index ad89504655af..ad99f6527bd6 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -323,9 +323,9 @@ pi433_receive(void *data)
dev->interrupt_rx_allowed = false;
 
/* wait for any tx to finish */
-   dev_dbg(dev->dev,"rx: going to wait for any tx to finish");
+   dev_dbg(dev->dev, "rx: going to wait for any tx to finish");
retval = wait_event_interruptible(dev->rx_wait_queue, !dev->tx_active);
-   if(retval) { /* wait was interrupted */
+   if (retval) { /* wait was interrupted */
dev->interrupt_rx_allowed = true;
wake_up_interruptible(&dev->tx_wait_queue);
return retval;
@@ -373,7 +373,7 @@ pi433_receive(void *data)
goto abort;
}
bytes_total = dev->rx_cfg.fixed_message_length;
-   dev_dbg(dev->dev,"rx: msg len set to %d by fixed length", 
bytes_total);
+   dev_dbg(dev->dev, "rx: msg len set to %d by fixed length", 
bytes_total);
} else {
bytes_total = dev->rx_buffer_size;
dev_dbg(dev->dev, "rx: msg len set to %d as requested by read", 
bytes_total);
@@ -582,7 +582,7 @@ pi433_tx_thread(void *data)
device->free_in_fifo = FIFO_SIZE;
position = 0;
repetitions = tx_cfg.repetitions;
-   while((repetitions > 0) && (size > position)) {
+   while ((repetitions > 0) && (size > position)) {
if ((size - position) > device->free_in_fifo) {
/* msg to big for fifo - take a part */
int temp = device->free_in_fifo;
@@ -590,7 +590,7 @@ pi433_tx_thread(void *data)
rf69_write_fifo(spi,
&buffer[position],
temp);
-   position +=temp;
+   position += temp;
} else {
/* msg fits into fifo - take all */
device->free_in_fifo -= size;
@@ -882,7 +882,7 @@ static int setup_GPIOs(struct pi433_device *device)
DIO1_irq_handler
};
 
-   for (i=0; igpiod[i] = gpiod_get(&device->spi->dev, name, 0 
/*GPIOD_IN*/);
@@ -898,7 +898,7 @@ static int setup_GPIOs(struct pi433_device *device)
if (IS_ERR(device->gpiod[i])) {
retval = PTR_ERR(device->gpiod[i]);
/* release already allocated gpios */
-   for (i--; i>=0; i--) {
+   for (i--; i >= 0; i--) {
free_irq(device->irq_num[i], device);
gpiod_put(device->gpiod[i]);
}
@@ -938,7 +938,7 @@ static void free_GPIOs(struct pi433_device *device)
 {
int i;
 
-   for (i=0; igpiod[i]))
continue;
-- 
2.11.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 6/6] staging: pi433: pi433_if.c: use tabs instead of spaces

2017-11-15 Thread Chase Metzger
Replace spaces with tabs where possible to comply with the kernel
coding style.

Signed-off-by: Chase Metzger 
---
 drivers/staging/pi433/pi433_if.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index ad99f6527bd6..ad625a7cc76e 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -350,8 +350,8 @@ pi433_receive(void *data)
/* wait for RSSI level to become high */
dev_dbg(dev->dev, "rx: going to wait for high RSSI level");
retval = wait_event_interruptible(dev->rx_wait_queue,
- rf69_get_flag(dev->spi,
-   
rssiExceededThreshold));
+ rf69_get_flag(dev->spi,
+   
rssiExceededThreshold));
if (retval) /* wait was interrupted */
goto abort;
dev->interrupt_rx_allowed = false;
@@ -588,8 +588,8 @@ pi433_tx_thread(void *data)
int temp = device->free_in_fifo;
device->free_in_fifo = 0;
rf69_write_fifo(spi,
-   &buffer[position],
-   temp);
+   &buffer[position],
+   temp);
position += temp;
} else {
/* msg fits into fifo - take all */
-- 
2.11.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 0/6] staging: pi433: pi433_if.c: coding style fixes

2017-11-15 Thread Chase Metzger
Fixes some of the coding style violations to comply with the kernel
coding style.

Chase Metzger (6):
  staging: pi433: pi433_if.c: fix opening curly brace coding style
issues
  staging: pi433: pi433_if.c: fix else if/else statements coding style
issues
  staging: pi433: pi433_if.c: fix trailing statement coding style issues
  staging: pi433: pi433_if.c: fix space prohibited coding style issues
  staging: pi433: pi433_if.c: fix space(s) required coding style issues
  staging: pi433: pi433_if.c: use tabs instead of spaces

 drivers/staging/pi433/pi433_if.c | 203 +--
 1 file changed, 87 insertions(+), 116 deletions(-)

-- 
2.11.0

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 1/6] staging: pi433: pi433_if.c: fix opening curly brace coding style issues

2017-11-15 Thread Chase Metzger
Put opening curly braces for if/else/else if statements and for/while loops
on the same line as the statements or loops to comply with the kernel
coding style.

Signed-off-by: Chase Metzger 
---
 drivers/staging/pi433/pi433_if.c | 110 ++-
 1 file changed, 38 insertions(+), 72 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index ff86db1c6cbd..76d70345229a 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -153,12 +153,10 @@ static irqreturn_t DIO1_irq_handler(int irq, void *dev_id)
 {
struct pi433_device *device = dev_id;
 
-   if  (device->irq_state[DIO1] == DIO_FifoNotEmpty_DIO1)
-   {
+   if  (device->irq_state[DIO1] == DIO_FifoNotEmpty_DIO1) {
device->free_in_fifo = FIFO_SIZE;
}
-   else if (device->irq_state[DIO1] == DIO_FifoLevel)
-   {
+   else if (device->irq_state[DIO1] == DIO_FifoLevel) {
if (device->rx_active)  device->free_in_fifo = FIFO_THRESHOLD - 
1;
elsedevice->free_in_fifo = FIFO_SIZE - 
FIFO_THRESHOLD - 1;
}
@@ -193,12 +191,10 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct 
pi433_rx_cfg *rx_cfg)
/* packet config */
/* enable */
SET_CHECKED(rf69_set_sync_enable(dev->spi, rx_cfg->enable_sync));
-   if (rx_cfg->enable_sync == optionOn)
-   {
+   if (rx_cfg->enable_sync == optionOn) {
SET_CHECKED(rf69_set_fifo_fill_condition(dev->spi, 
afterSyncInterrupt));
}
-   else
-   {
+   else {
SET_CHECKED(rf69_set_fifo_fill_condition(dev->spi, always));
}
if (rx_cfg->enable_length_byte == optionOn) {
@@ -215,29 +211,24 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct 
pi433_rx_cfg *rx_cfg)
 
/* lengths */
SET_CHECKED(rf69_set_sync_size(dev->spi, rx_cfg->sync_length));
-   if (rx_cfg->enable_length_byte == optionOn)
-   {
+   if (rx_cfg->enable_length_byte == optionOn) {
SET_CHECKED(rf69_set_payload_length(dev->spi, 0xff));
}
-   else if (rx_cfg->fixed_message_length != 0)
-   {
+   else if (rx_cfg->fixed_message_length != 0) {
payload_length = rx_cfg->fixed_message_length;
if (rx_cfg->enable_length_byte  == optionOn) payload_length++;
if (rx_cfg->enable_address_filtering != filteringOff) 
payload_length++;
SET_CHECKED(rf69_set_payload_length(dev->spi, payload_length));
}
-   else
-   {
+   else {
SET_CHECKED(rf69_set_payload_length(dev->spi, 0));
}
 
/* values */
-   if (rx_cfg->enable_sync == optionOn)
-   {
+   if (rx_cfg->enable_sync == optionOn) {
SET_CHECKED(rf69_set_sync_values(dev->spi, 
rx_cfg->sync_pattern));
}
-   if (rx_cfg->enable_address_filtering != filteringOff)
-   {
+   if (rx_cfg->enable_address_filtering != filteringOff) {
SET_CHECKED(rf69_set_node_address (dev->spi, 
rx_cfg->node_address));
SET_CHECKED(rf69_set_broadcast_address(dev->spi, 
rx_cfg->broadcast_address));
}
@@ -259,12 +250,10 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct 
pi433_tx_cfg *tx_cfg)
SET_CHECKED(rf69_set_tx_start_condition(dev->spi, 
tx_cfg->tx_start_condition));
 
/* packet format enable */
-   if (tx_cfg->enable_preamble == optionOn)
-   {
+   if (tx_cfg->enable_preamble == optionOn) {
SET_CHECKED(rf69_set_preamble_length(dev->spi, 
tx_cfg->preamble_length));
}
-   else
-   {
+   else {
SET_CHECKED(rf69_set_preamble_length(dev->spi, 0));
}
SET_CHECKED(rf69_set_sync_enable  (dev->spi, tx_cfg->enable_sync));
@@ -336,8 +325,7 @@ pi433_receive(void *data)
/* wait for any tx to finish */
dev_dbg(dev->dev,"rx: going to wait for any tx to finish");
retval = wait_event_interruptible(dev->rx_wait_queue, !dev->tx_active);
-   if(retval) /* wait was interrupted */
-   {
+   if(retval) { /* wait was interrupted */
dev->interrupt_rx_allowed = true;
wake_up_interruptible(&dev->tx_wait_queue);
return retval;
@@ -354,8 +342,7 @@ pi433_receive(void *data)
return retval;
 
/* now check RSSI, if low wait for getting high (RSSI interrupt) */
-   while ( !rf69_get_flag(dev->spi, rssiExceededThreshold) )
-   {
+   while ( !rf69_get_flag(dev->spi, rssiExceededThreshold) ) {
/* allow tx to interrupt us while waiting for high RSSI */
dev->interrupt_rx_allowed = true;
wake_

[PATCH 2/6] staging: pi433: pi433_if.c: fix else if/else statements coding style issues

2017-11-15 Thread Chase Metzger
Put else if/else statements on same line as if/else if statements
closing curly brace to comply with the kernel coding style.

Signed-off-by: Chase Metzger 
---
 drivers/staging/pi433/pi433_if.c | 33 +++--
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index 76d70345229a..cd1430a04928 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -155,8 +155,7 @@ static irqreturn_t DIO1_irq_handler(int irq, void *dev_id)
 
if  (device->irq_state[DIO1] == DIO_FifoNotEmpty_DIO1) {
device->free_in_fifo = FIFO_SIZE;
-   }
-   else if (device->irq_state[DIO1] == DIO_FifoLevel) {
+   } else if (device->irq_state[DIO1] == DIO_FifoLevel) {
if (device->rx_active)  device->free_in_fifo = FIFO_THRESHOLD - 
1;
elsedevice->free_in_fifo = FIFO_SIZE - 
FIFO_THRESHOLD - 1;
}
@@ -193,8 +192,7 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct 
pi433_rx_cfg *rx_cfg)
SET_CHECKED(rf69_set_sync_enable(dev->spi, rx_cfg->enable_sync));
if (rx_cfg->enable_sync == optionOn) {
SET_CHECKED(rf69_set_fifo_fill_condition(dev->spi, 
afterSyncInterrupt));
-   }
-   else {
+   } else {
SET_CHECKED(rf69_set_fifo_fill_condition(dev->spi, always));
}
if (rx_cfg->enable_length_byte == optionOn) {
@@ -213,14 +211,12 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct 
pi433_rx_cfg *rx_cfg)
SET_CHECKED(rf69_set_sync_size(dev->spi, rx_cfg->sync_length));
if (rx_cfg->enable_length_byte == optionOn) {
SET_CHECKED(rf69_set_payload_length(dev->spi, 0xff));
-   }
-   else if (rx_cfg->fixed_message_length != 0) {
+   } else if (rx_cfg->fixed_message_length != 0) {
payload_length = rx_cfg->fixed_message_length;
if (rx_cfg->enable_length_byte  == optionOn) payload_length++;
if (rx_cfg->enable_address_filtering != filteringOff) 
payload_length++;
SET_CHECKED(rf69_set_payload_length(dev->spi, payload_length));
-   }
-   else {
+   } else {
SET_CHECKED(rf69_set_payload_length(dev->spi, 0));
}
 
@@ -252,8 +248,7 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct 
pi433_tx_cfg *tx_cfg)
/* packet format enable */
if (tx_cfg->enable_preamble == optionOn) {
SET_CHECKED(rf69_set_preamble_length(dev->spi, 
tx_cfg->preamble_length));
-   }
-   else {
+   } else {
SET_CHECKED(rf69_set_preamble_length(dev->spi, 0));
}
SET_CHECKED(rf69_set_sync_enable  (dev->spi, tx_cfg->enable_sync));
@@ -372,8 +367,7 @@ pi433_receive(void *data)
}
bytes_total = dev->rx_cfg.fixed_message_length;
dev_dbg(dev->dev,"rx: msg len set to %d by fixed length", 
bytes_total);
-   }
-   else {
+   } else {
bytes_total = dev->rx_buffer_size;
dev_dbg(dev->dev, "rx: msg len set to %d as requested by read", 
bytes_total);
}
@@ -552,8 +546,7 @@ pi433_tx_thread(void *data)
SET_CHECKED(rf69_set_fifo_threshold(spi, FIFO_THRESHOLD));
if (tx_cfg.enable_length_byte == optionOn) {
SET_CHECKED(rf69_set_payload_length(spi, size * 
tx_cfg.repetitions));
-   }
-   else {
+   } else {
SET_CHECKED(rf69_set_payload_length(spi, 0));
}
 
@@ -587,8 +580,7 @@ pi433_tx_thread(void *data)
&buffer[position],
temp);
position +=temp;
-   }
-   else {
+   } else {
/* msg fits into fifo - take all */
device->free_in_fifo -= size;
repetitions--;
@@ -650,8 +642,7 @@ pi433_read(struct file *filp, char __user *buf, size_t 
size, loff_t *f_pos)
if (device->rx_active) {
mutex_unlock(&device->rx_lock);
return -EAGAIN;
-   }
-   else {
+   } else {
device->rx_active = true;
mutex_unlock(&device->rx_lock);
}
@@ -998,8 +989,7 @@ static int pi433_probe(struct spi_device *spi)
if (retval) {
dev_dbg(&spi->dev, "configuration of SPI interface failed!\n");
return retval;
-   }
-   else {
+   } else {
dev_dbg(&spi->dev,
"spi interface setup: mode 0x

[PATCH] staging: android: sync.c: Changed the ways nullptrs were being checked

2015-12-23 Thread Chase Metzger
Removed all checkpatch.pl CHECKs that suggested to check NULL by
!obj instead of obj == NULL.

Signed-off-by: Chase Metzger 
---
 drivers/staging/android/sync.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index f83e00c..5413f28 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -43,7 +43,7 @@ struct sync_timeline *sync_timeline_create(const struct 
sync_timeline_ops *ops,
return NULL;
 
obj = kzalloc(size, GFP_KERNEL);
-   if (obj == NULL)
+   if (!obj)
return NULL;
 
kref_init(&obj->kref);
@@ -130,7 +130,7 @@ struct sync_pt *sync_pt_create(struct sync_timeline *obj, 
int size)
return NULL;
 
pt = kzalloc(size, GFP_KERNEL);
-   if (pt == NULL)
+   if (!pt)
return NULL;
 
spin_lock_irqsave(&obj->child_list_lock, flags);
@@ -155,7 +155,7 @@ static struct sync_fence *sync_fence_alloc(int size, const 
char *name)
struct sync_fence *fence;
 
fence = kzalloc(size, GFP_KERNEL);
-   if (fence == NULL)
+   if (!fence)
return NULL;
 
fence->file = anon_inode_getfile("sync_fence", &sync_fence_fops,
@@ -193,7 +193,7 @@ struct sync_fence *sync_fence_create(const char *name, 
struct sync_pt *pt)
struct sync_fence *fence;
 
fence = sync_fence_alloc(offsetof(struct sync_fence, cbs[1]), name);
-   if (fence == NULL)
+   if (!fence)
return NULL;
 
fence->num_fences = 1;
@@ -215,7 +215,7 @@ struct sync_fence *sync_fence_fdget(int fd)
 {
struct file *file = fget(fd);
 
-   if (file == NULL)
+   if (!file)
return NULL;
 
if (file->f_op != &sync_fence_fops)
@@ -262,7 +262,7 @@ struct sync_fence *sync_fence_merge(const char *name,
unsigned long size = offsetof(struct sync_fence, cbs[num_fences]);
 
fence = sync_fence_alloc(size, name);
-   if (fence == NULL)
+   if (!fence)
return NULL;
 
atomic_set(&fence->status, num_fences);
@@ -583,14 +583,14 @@ static long sync_fence_ioctl_merge(struct sync_fence 
*fence, unsigned long arg)
}
 
fence2 = sync_fence_fdget(data.fd2);
-   if (fence2 == NULL) {
+   if (!fence2) {
err = -ENOENT;
goto err_put_fd;
}
 
data.name[sizeof(data.name) - 1] = '\0';
fence3 = sync_fence_merge(data.name, fence, fence2);
-   if (fence3 == NULL) {
+   if (!fence3) {
err = -ENOMEM;
goto err_put_fence2;
}
@@ -666,7 +666,7 @@ static long sync_fence_ioctl_fence_info(struct sync_fence 
*fence,
size = 4096;
 
data = kzalloc(size, GFP_KERNEL);
-   if (data == NULL)
+   if (!data)
return -ENOMEM;
 
strlcpy(data->name, fence->name, sizeof(data->name));
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] usb: core: devio.c: Removed unnecessary space

2015-12-31 Thread Chase Metzger
Removed an unnecessary space between a function name and arguments.

Signed-off-by: Chase Metzger 
---
 drivers/usb/core/devio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 38ae877c..0bcd45e 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1910,7 +1910,7 @@ static int proc_releaseinterface(struct usb_dev_state 
*ps, void __user *arg)
ret = releaseintf(ps, ifnum);
if (ret < 0)
return ret;
-   destroy_async_on_interface (ps, ifnum);
+   destroy_async_on_interface(ps, ifnum);
return 0;
 }
 
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: android: sync.c: Changed the ways nullptrs were being checked

2015-12-31 Thread Chase Metzger
Removed all checkpatch.pl CHECKs that suggested to check NULL by
!obj instead of obj == NULL.

Signed-off-by: Chase Metzger 
---
 drivers/staging/android/sync.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index f83e00c..5413f28 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -43,7 +43,7 @@ struct sync_timeline *sync_timeline_create(const struct 
sync_timeline_ops *ops,
return NULL;
 
obj = kzalloc(size, GFP_KERNEL);
-   if (obj == NULL)
+   if (!obj)
return NULL;
 
kref_init(&obj->kref);
@@ -130,7 +130,7 @@ struct sync_pt *sync_pt_create(struct sync_timeline *obj, 
int size)
return NULL;
 
pt = kzalloc(size, GFP_KERNEL);
-   if (pt == NULL)
+   if (!pt)
return NULL;
 
spin_lock_irqsave(&obj->child_list_lock, flags);
@@ -155,7 +155,7 @@ static struct sync_fence *sync_fence_alloc(int size, const 
char *name)
struct sync_fence *fence;
 
fence = kzalloc(size, GFP_KERNEL);
-   if (fence == NULL)
+   if (!fence)
return NULL;
 
fence->file = anon_inode_getfile("sync_fence", &sync_fence_fops,
@@ -193,7 +193,7 @@ struct sync_fence *sync_fence_create(const char *name, 
struct sync_pt *pt)
struct sync_fence *fence;
 
fence = sync_fence_alloc(offsetof(struct sync_fence, cbs[1]), name);
-   if (fence == NULL)
+   if (!fence)
return NULL;
 
fence->num_fences = 1;
@@ -215,7 +215,7 @@ struct sync_fence *sync_fence_fdget(int fd)
 {
struct file *file = fget(fd);
 
-   if (file == NULL)
+   if (!file)
return NULL;
 
if (file->f_op != &sync_fence_fops)
@@ -262,7 +262,7 @@ struct sync_fence *sync_fence_merge(const char *name,
unsigned long size = offsetof(struct sync_fence, cbs[num_fences]);
 
fence = sync_fence_alloc(size, name);
-   if (fence == NULL)
+   if (!fence)
return NULL;
 
atomic_set(&fence->status, num_fences);
@@ -583,14 +583,14 @@ static long sync_fence_ioctl_merge(struct sync_fence 
*fence, unsigned long arg)
}
 
fence2 = sync_fence_fdget(data.fd2);
-   if (fence2 == NULL) {
+   if (!fence2) {
err = -ENOENT;
goto err_put_fd;
}
 
data.name[sizeof(data.name) - 1] = '\0';
fence3 = sync_fence_merge(data.name, fence, fence2);
-   if (fence3 == NULL) {
+   if (!fence3) {
err = -ENOMEM;
goto err_put_fence2;
}
@@ -666,7 +666,7 @@ static long sync_fence_ioctl_fence_info(struct sync_fence 
*fence,
size = 4096;
 
data = kzalloc(size, GFP_KERNEL);
-   if (data == NULL)
+   if (!data)
return -ENOMEM;
 
strlcpy(data->name, fence->name, sizeof(data->name));
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] drivers/staging/greybus: gpio.c - Fixed a checkpatch generated warning

2016-09-25 Thread Chase Metzger
Removed braces for single line if statement.

Signed-off-by: Chase Metzger 
---
 drivers/staging/greybus/gpio.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c
index ea8234a..5e06e42 100644
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@ -561,9 +561,8 @@ static void gb_gpio_irqchip_remove(struct 
gb_gpio_controller *ggc)
irq_domain_remove(ggc->irqdomain);
}
 
-   if (ggc->irqchip) {
+   if (ggc->irqchip)
ggc->irqchip = NULL;
-   }
 }
 
 /**
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] drivers: staging: greybus: Fixed CHECKS for brace issues

2016-10-06 Thread Chase Metzger
Added braces to else statements where checkpatch complained.

Signed-off-by: Chase Metzger 
---
 drivers/staging/greybus/audio_topology.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/greybus/audio_topology.c 
b/drivers/staging/greybus/audio_topology.c
index b625169..3a2678e 100644
--- a/drivers/staging/greybus/audio_topology.c
+++ b/drivers/staging/greybus/audio_topology.c
@@ -1044,8 +1044,10 @@ static int gbaudio_tplg_create_widget(struct 
gbaudio_module_info *module,
control->texts = (const char * const *)
gb_generate_enum_strings(module, gbenum);
control->items = gbenum->items;
-   } else
+   } else {
csize = sizeof(struct gb_audio_control);
+   }
+
*w_size += csize;
curr = (void *)curr + csize;
list_add(&control->list, &module->widget_ctl_list);
@@ -1190,8 +1192,9 @@ static int gbaudio_tplg_process_kcontrols(struct 
gbaudio_module_info *module,
control->texts = (const char * const *)
gb_generate_enum_strings(module, gbenum);
control->items = gbenum->items;
-   } else
+   } else {
csize = sizeof(struct gb_audio_control);
+   }
 
list_add(&control->list, &module->ctl_list);
dev_dbg(module->dev, "%d:%s created of type %d\n", curr->id,
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] drivers: staging: greybus: Fixed CHECKS for brace issues

2016-10-07 Thread Chase Metzger
Added braces to else statements where checkpatch complained.

Signed-off-by: Chase Metzger 
---
 drivers/staging/greybus/audio_codec.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/greybus/audio_codec.c 
b/drivers/staging/greybus/audio_codec.c
index 8a0744b..1bdf849 100644
--- a/drivers/staging/greybus/audio_codec.c
+++ b/drivers/staging/greybus/audio_codec.c
@@ -655,8 +655,10 @@ static int gbcodec_mute_stream(struct snd_soc_dai *dai, 
int mute, int stream)
ret = gb_audio_apbridgea_shutdown_rx(data->connection,
 0);
params->state = GBAUDIO_CODEC_STOP;
-   } else
+   } else {
ret = -EINVAL;
+   }
+
if (ret)
dev_err_ratelimited(dai->dev,
"%s:Error during %s %s stream:%d\n",
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] drivers: staging: greybus: audio_codec.c: Fixed CHECKS for brace issues

2016-10-09 Thread Chase Metzger
Added braces to else statement where checkpatch complained.

Signed-off-by: Chase Metzger 
---
 drivers/staging/greybus/audio_codec.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/greybus/audio_codec.c 
b/drivers/staging/greybus/audio_codec.c
index 8a0744b..1bdf849 100644
--- a/drivers/staging/greybus/audio_codec.c
+++ b/drivers/staging/greybus/audio_codec.c
@@ -655,8 +655,10 @@ static int gbcodec_mute_stream(struct snd_soc_dai *dai, 
int mute, int stream)
ret = gb_audio_apbridgea_shutdown_rx(data->connection,
 0);
params->state = GBAUDIO_CODEC_STOP;
-   } else
+   } else {
ret = -EINVAL;
+   }
+
if (ret)
dev_err_ratelimited(dai->dev,
"%s:Error during %s %s stream:%d\n",
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] drivers: staging: greybus: audio_manager_sysfs.c: Fixed CHECK for brace issue

2016-10-11 Thread Chase Metzger
Added braces to else and else if statements where checkpatch complained.

Signed-off-by: Chase Metzger 
---
 drivers/staging/greybus/audio_manager_sysfs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/greybus/audio_manager_sysfs.c 
b/drivers/staging/greybus/audio_manager_sysfs.c
index d8bf859..376e17c 100644
--- a/drivers/staging/greybus/audio_manager_sysfs.c
+++ b/drivers/staging/greybus/audio_manager_sysfs.c
@@ -71,10 +71,11 @@ static ssize_t manager_sysfs_dump_store(
num = gb_audio_manager_dump_module(id);
if (num)
return num;
-   } else if (!strncmp("all", buf, 3))
+   } else if (!strncmp("all", buf, 3)) {
gb_audio_manager_dump_all();
-   else
+   } else {
return -EINVAL;
+   }
 
return count;
 }
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] drivers: staging: greybus: audio_topology.c: Fixed CHECKS for brace issues

2016-10-11 Thread Chase Metzger
Added braces for else and else if statements where checkpatch complained.

Signed-off-by: Chase Metzger 
---
 drivers/staging/greybus/audio_topology.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/greybus/audio_topology.c 
b/drivers/staging/greybus/audio_topology.c
index b625169..3a2678e 100644
--- a/drivers/staging/greybus/audio_topology.c
+++ b/drivers/staging/greybus/audio_topology.c
@@ -1044,8 +1044,10 @@ static int gbaudio_tplg_create_widget(struct 
gbaudio_module_info *module,
control->texts = (const char * const *)
gb_generate_enum_strings(module, gbenum);
control->items = gbenum->items;
-   } else
+   } else {
csize = sizeof(struct gb_audio_control);
+   }
+
*w_size += csize;
curr = (void *)curr + csize;
list_add(&control->list, &module->widget_ctl_list);
@@ -1190,8 +1192,9 @@ static int gbaudio_tplg_process_kcontrols(struct 
gbaudio_module_info *module,
control->texts = (const char * const *)
gb_generate_enum_strings(module, gbenum);
control->items = gbenum->items;
-   } else
+   } else {
csize = sizeof(struct gb_audio_control);
+   }
 
list_add(&control->list, &module->ctl_list);
dev_dbg(module->dev, "%d:%s created of type %d\n", curr->id,
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH] staging: greybus: timesync.c: Fixed WARNING for brace issue

2016-10-12 Thread Chase Metzger
Removed a checkpatch warning for braces on single argument if and else
statement.

Signed-off-by: Chase Metzger 
---
 drivers/staging/greybus/timesync.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/greybus/timesync.c 
b/drivers/staging/greybus/timesync.c
index 2e68af7..e586627 100644
--- a/drivers/staging/greybus/timesync.c
+++ b/drivers/staging/greybus/timesync.c
@@ -807,11 +807,11 @@ static int gb_timesync_schedule(struct gb_timesync_svc 
*timesync_svc, int state)
return -EINVAL;
 
mutex_lock(×ync_svc->mutex);
-   if (timesync_svc->state !=  GB_TIMESYNC_STATE_INVALID) {
+   if (timesync_svc->state !=  GB_TIMESYNC_STATE_INVALID)
gb_timesync_set_state_atomic(timesync_svc, state);
-   } else {
+   else
ret = -ENODEV;
-   }
+
mutex_unlock(×ync_svc->mutex);
return ret;
 }
-- 
2.1.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel