[PATCH] staging: pi433: break long lines

[Bryan Brattlof]

scripts/checkpatch.pl is warning about some lines exceeding 100
charecters. This will cleanup the warnings.

Signed-off-by: Bryan Brattlof 
---
 drivers/staging/pi433/pi433_if.h | 26 ++
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.h b/drivers/staging/pi433/pi433_if.h
index 16c5b7fba249..d5c1521192c1 100644
--- a/drivers/staging/pi433/pi433_if.h
+++ b/drivers/staging/pi433/pi433_if.h
@@ -117,9 +117,15 @@ struct pi433_rx_cfg {
 
/* packet format */
enum option_on_off  enable_sync;
-   enum option_on_off  enable_length_byte;   /* should be used in 
combination with sync, only */
-   enum address_filtering  enable_address_filtering; /* operational with 
sync, only */
-   enum option_on_off  enable_crc;   /* only operational, 
if sync on and fixed length or length byte is used */
+
+   /* should be used in combination with sync, only */
+   enum option_on_off  enable_length_byte;
+
+   /* operational with sync, only */
+   enum address_filtering  enable_address_filtering;
+
+   /* only operational, if sync on and fixed length or length byte is used 
*/
+   enum option_on_off  enable_crc;
 
__u8sync_length;
__u8fixed_message_length;
@@ -130,12 +136,16 @@ struct pi433_rx_cfg {
__u8broadcast_address;
 };
 
-#define PI433_IOC_MAGIC'r'
+#define PI433_IOC_MAGIC'r'
 
-#define PI433_IOC_RD_TX_CFG_IOR(PI433_IOC_MAGIC, PI433_TX_CFG_IOCTL_NR, 
char[sizeof(struct pi433_tx_cfg)])
-#define PI433_IOC_WR_TX_CFG_IOW(PI433_IOC_MAGIC, PI433_TX_CFG_IOCTL_NR, 
char[sizeof(struct pi433_tx_cfg)])
+#define PI433_IOC_RD_TX_CFG \
+   _IOR(PI433_IOC_MAGIC, PI433_TX_CFG_IOCTL_NR, char[sizeof(struct 
pi433_tx_cfg)])
+#define PI433_IOC_WR_TX_CFG \
+   _IOW(PI433_IOC_MAGIC, PI433_TX_CFG_IOCTL_NR, char[sizeof(struct 
pi433_tx_cfg)])
 
-#define PI433_IOC_RD_RX_CFG_IOR(PI433_IOC_MAGIC, PI433_RX_CFG_IOCTL_NR, 
char[sizeof(struct pi433_rx_cfg)])
-#define PI433_IOC_WR_RX_CFG_IOW(PI433_IOC_MAGIC, PI433_RX_CFG_IOCTL_NR, 
char[sizeof(struct pi433_rx_cfg)])
+#define PI433_IOC_RD_RX_CFG \
+   _IOR(PI433_IOC_MAGIC, PI433_RX_CFG_IOCTL_NR, char[sizeof(struct 
pi433_rx_cfg)])
+#define PI433_IOC_WR_RX_CFG \
+   _IOW(PI433_IOC_MAGIC, PI433_RX_CFG_IOCTL_NR, char[sizeof(struct 
pi433_rx_cfg)])
 
 #endif /* PI433_H */
-- 
2.17.1

Re: [PATCH] staging: pi433: break long lines in pi433_if.c

[Greg KH]

On Fri, Apr 06, 2018 at 10:48:17PM +0200, Simon Sandström wrote:
> Breaks long lines in pi433_if.c, fixing checkpatch.pl warnings:
> "WARNING: line over 80 characters"
> 
> Signed-off-by: Simon Sandström 
> ---
>  drivers/staging/pi433/pi433_if.c | 19 ++-
>  1 file changed, 14 insertions(+), 5 deletions(-)

This patch did not apply, please fix up and resend.

thanks,

greg k-h

[PATCH] staging: pi433: break long lines in rf69.c

[Simon Sandström]

Breaks long lines in rf69.c, fixing checkpatch.pl warnings:
"WARNING: line over 80 characters"

Signed-off-by: Simon Sandström 
---
 drivers/staging/pi433/rf69.c | 182 ++-
 1 file changed, 129 insertions(+), 53 deletions(-)

diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c
index 5b0554823263..90280e9b006d 100644
--- a/drivers/staging/pi433/rf69.c
+++ b/drivers/staging/pi433/rf69.c
@@ -97,7 +97,8 @@ static int rf69_clear_bit(struct spi_device *spi, u8 reg, u8 
mask)
return rf69_write_reg(spi, reg, tmp);
 }
 
-static inline int rf69_read_mod_write(struct spi_device *spi, u8 reg, u8 mask, 
u8 value)
+static inline int rf69_read_mod_write(struct spi_device *spi, u8 reg,
+ u8 mask, u8 value)
 {
u8 tmp;
 
@@ -112,15 +113,20 @@ int rf69_set_mode(struct spi_device *spi, enum mode mode)
 {
switch (mode) {
case transmit:
-   return rf69_read_mod_write(spi, REG_OPMODE, MASK_OPMODE_MODE, 
OPMODE_MODE_TRANSMIT);
+   return rf69_read_mod_write(spi, REG_OPMODE, MASK_OPMODE_MODE,
+  OPMODE_MODE_TRANSMIT);
case receive:
-   return rf69_read_mod_write(spi, REG_OPMODE, MASK_OPMODE_MODE, 
OPMODE_MODE_RECEIVE);
+   return rf69_read_mod_write(spi, REG_OPMODE, MASK_OPMODE_MODE,
+  OPMODE_MODE_RECEIVE);
case synthesizer:
-   return rf69_read_mod_write(spi, REG_OPMODE, MASK_OPMODE_MODE, 
OPMODE_MODE_SYNTHESIZER);
+   return rf69_read_mod_write(spi, REG_OPMODE, MASK_OPMODE_MODE,
+  OPMODE_MODE_SYNTHESIZER);
case standby:
-   return rf69_read_mod_write(spi, REG_OPMODE, MASK_OPMODE_MODE, 
OPMODE_MODE_STANDBY);
+   return rf69_read_mod_write(spi, REG_OPMODE, MASK_OPMODE_MODE,
+  OPMODE_MODE_STANDBY);
case mode_sleep:
-   return rf69_read_mod_write(spi, REG_OPMODE, MASK_OPMODE_MODE, 
OPMODE_MODE_SLEEP);
+   return rf69_read_mod_write(spi, REG_OPMODE, MASK_OPMODE_MODE,
+  OPMODE_MODE_SLEEP);
default:
dev_dbg(&spi->dev, "set: illegal input param");
return -EINVAL;
@@ -133,16 +139,21 @@ int rf69_set_mode(struct spi_device *spi, enum mode mode)
 
 int rf69_set_data_mode(struct spi_device *spi, u8 data_mode)
 {
-   return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODE, 
data_mode);
+   return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODE,
+  data_mode);
 }
 
 int rf69_set_modulation(struct spi_device *spi, enum modulation modulation)
 {
switch (modulation) {
case OOK:
-   return rf69_read_mod_write(spi, REG_DATAMODUL, 
MASK_DATAMODUL_MODULATION_TYPE, DATAMODUL_MODULATION_TYPE_OOK);
+   return rf69_read_mod_write(spi, REG_DATAMODUL,
+  MASK_DATAMODUL_MODULATION_TYPE,
+  DATAMODUL_MODULATION_TYPE_OOK);
case FSK:
-   return rf69_read_mod_write(spi, REG_DATAMODUL, 
MASK_DATAMODUL_MODULATION_TYPE, DATAMODUL_MODULATION_TYPE_FSK);
+   return rf69_read_mod_write(spi, REG_DATAMODUL,
+  MASK_DATAMODUL_MODULATION_TYPE,
+  DATAMODUL_MODULATION_TYPE_FSK);
default:
dev_dbg(&spi->dev, "set: illegal input param");
return -EINVAL;
@@ -172,13 +183,21 @@ int rf69_set_modulation_shaping(struct spi_device *spi,
case FSK:
switch (mod_shaping) {
case SHAPING_OFF:
-   return rf69_read_mod_write(spi, REG_DATAMODUL, 
MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_NONE);
+   return rf69_read_mod_write(spi, REG_DATAMODUL,
+  
MASK_DATAMODUL_MODULATION_SHAPE,
+  
DATAMODUL_MODULATION_SHAPE_NONE);
case SHAPING_1_0:
-   return rf69_read_mod_write(spi, REG_DATAMODUL, 
MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_1_0);
+   return rf69_read_mod_write(spi, REG_DATAMODUL,
+  
MASK_DATAMODUL_MODULATION_SHAPE,
+  
DATAMODUL_MODULATION_SHAPE_1_0);
case SHAPING_0_5:
-   return rf69_read_mod_write(spi, REG_DATAMODUL, 
MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_0_5);
+   return rf69_read_mod_write(spi, REG_DATAMODUL,
+  
MASK_DATAMODUL_MODULATION_SHAPE,
+ 

[PATCH] staging: pi433: break long lines in pi433_if.c

[Simon Sandström]

Breaks long lines in pi433_if.c, fixing checkpatch.pl warnings:
"WARNING: line over 80 characters"

Signed-off-by: Simon Sandström 
---
 drivers/staging/pi433/pi433_if.c | 19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index d1e0ddbc79ce..795cf77e002c 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -593,14 +593,18 @@ 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;
}
@@ -623,7 +627,11 @@ pi433_tx_thread(void *data)
 
/* add length byte, if requested */
if (tx_cfg.enable_length_byte  == OPTION_ON)
-   device->buffer[position++] = size - 1; /* according to 
spec length byte itself must be excluded from the length calculation */
+   /*
+* according to spec, length byte itself must be
+* excluded from the length calculation
+*/
+   device->buffer[position++] = size - 1;
 
/* add adr byte, if requested */
if (tx_cfg.enable_address_byte == OPTION_ON)
@@ -856,7 +864,8 @@ pi433_write(struct file *filp, const char __user *buf,
 
 abort:
dev_dbg(device->dev, "write to fifo failed: 0x%x", retval);
-   kfifo_reset(&device->tx_fifo); // TODO: maybe find a solution, not to 
discard already stored, valid entries
+   /* TODO: find a solution to not discard already stored valid entries */
+   kfifo_reset(&device->tx_fifo);
mutex_unlock(&device->tx_fifo_lock);
return -EAGAIN;
 }
@@ -1042,7 +1051,7 @@ static int setup_gpio(struct pi433_device *device)
/* configure irq */
device->irq_num[i] = gpiod_to_irq(device->gpiod[i]);
if (device->irq_num[i] < 0) {
-   device->gpiod[i] = ERR_PTR(-EINVAL);//(struct gpio_desc 
*)device->irq_num[i];
+   device->gpiod[i] = ERR_PTR(-EINVAL);
return device->irq_num[i];
}
retval = request_irq(device->irq_num[i],
-- 
2.11.0

[PATCH] staging: pi433: break long lines

[Simon Sandström]

Breaks long lines in rf69.h, fixing checkpatch.pl warnings:
"WARNING: line over 80 characters"

Signed-off-by: Simon Sandström 
---
 drivers/staging/pi433/rf69.h | 28 +++-
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h
index b9f6850e3316..c131ffbdc2db 100644
--- a/drivers/staging/pi433/rf69.h
+++ b/drivers/staging/pi433/rf69.h
@@ -28,7 +28,8 @@
 int rf69_set_mode(struct spi_device *spi, enum mode mode);
 int rf69_set_data_mode(struct spi_device *spi, u8 data_mode);
 int rf69_set_modulation(struct spi_device *spi, enum modulation modulation);
-int rf69_set_modulation_shaping(struct spi_device *spi, enum mod_shaping 
mod_shaping);
+int rf69_set_modulation_shaping(struct spi_device *spi,
+   enum mod_shaping mod_shaping);
 int rf69_set_bit_rate(struct spi_device *spi, u16 bit_rate);
 int rf69_set_deviation(struct spi_device *spi, u32 deviation);
 int rf69_set_frequency(struct spi_device *spi, u32 frequency);
@@ -36,28 +37,37 @@ int rf69_enable_amplifier(struct spi_device *spi, u8 
amplifier_mask);
 int rf69_disable_amplifier(struct spi_device *spi, u8 amplifier_mask);
 int rf69_set_output_power_level(struct spi_device *spi, u8 power_level);
 int rf69_set_pa_ramp(struct spi_device *spi, enum pa_ramp pa_ramp);
-int rf69_set_antenna_impedance(struct spi_device *spi, enum antenna_impedance 
antenna_impedance);
+int rf69_set_antenna_impedance(struct spi_device *spi,
+  enum antenna_impedance antenna_impedance);
 int rf69_set_lna_gain(struct spi_device *spi, enum lna_gain lna_gain);
-int rf69_set_bandwidth(struct spi_device *spi, enum mantisse mantisse, u8 
exponent);
-int rf69_set_bandwidth_during_afc(struct spi_device *spi, enum mantisse 
mantisse, u8 exponent);
-int rf69_set_ook_threshold_dec(struct spi_device *spi, enum 
threshold_decrement threshold_decrement);
+int rf69_set_bandwidth(struct spi_device *spi, enum mantisse mantisse,
+  u8 exponent);
+int rf69_set_bandwidth_during_afc(struct spi_device *spi,
+ enum mantisse mantisse,
+ u8 exponent);
+int rf69_set_ook_threshold_dec(struct spi_device *spi,
+  enum threshold_decrement threshold_decrement);
 int rf69_set_dio_mapping(struct spi_device *spi, u8 dio_number, u8 value);
 bool rf69_get_flag(struct spi_device *spi, enum flag flag);
 int rf69_set_rssi_threshold(struct spi_device *spi, u8 threshold);
 int rf69_set_preamble_length(struct spi_device *spi, u16 preamble_length);
 int rf69_enable_sync(struct spi_device *spi);
 int rf69_disable_sync(struct spi_device *spi);
-int rf69_set_fifo_fill_condition(struct spi_device *spi, enum 
fifo_fill_condition fifo_fill_condition);
+int rf69_set_fifo_fill_condition(struct spi_device *spi,
+enum fifo_fill_condition fifo_fill_condition);
 int rf69_set_sync_size(struct spi_device *spi, u8 sync_size);
 int rf69_set_sync_values(struct spi_device *spi, u8 sync_values[8]);
-int rf69_set_packet_format(struct spi_device *spi, enum packet_format 
packet_format);
+int rf69_set_packet_format(struct spi_device *spi,
+  enum packet_format packet_format);
 int rf69_enable_crc(struct spi_device *spi);
 int rf69_disable_crc(struct spi_device *spi);
-int rf69_set_address_filtering(struct spi_device *spi, enum address_filtering 
address_filtering);
+int rf69_set_address_filtering(struct spi_device *spi,
+  enum address_filtering address_filtering);
 int rf69_set_payload_length(struct spi_device *spi, u8 payload_length);
 int rf69_set_node_address(struct spi_device *spi, u8 node_address);
 int rf69_set_broadcast_address(struct spi_device *spi, u8 broadcast_address);
-int rf69_set_tx_start_condition(struct spi_device *spi, enum 
tx_start_condition tx_start_condition);
+int rf69_set_tx_start_condition(struct spi_device *spi,
+   enum tx_start_condition tx_start_condition);
 int rf69_set_fifo_threshold(struct spi_device *spi, u8 threshold);
 int rf69_set_dagc(struct spi_device *spi, enum dagc dagc);
 
-- 
2.11.0