leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: pi433: remove multiple blank lines

Browse Source 
Fixes checkpatch warning for multiple blank lines in source.

Signed-off-by: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Valentin Vidic 2017-12-13 14:09:20 +01:00 committed by Greg Kroah-Hartman
parent 6106cfbd05
commit 82a708e740
4 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/pi433/pi433_if.c
View File

@ -54,7 +54,6 @@
#include "pi433_if.h" #include "pi433_if.h"
#include "rf69.h" #include "rf69.h"
#define N_PI433_MINORS (1U << MINORBITS) /*32*/ /* ... up to 256 */ #define N_PI433_MINORS (1U << MINORBITS) /*32*/ /* ... up to 256 */
#define MAX_MSG_SIZE 900 /* min: FIFO_SIZE! */ #define MAX_MSG_SIZE 900 /* min: FIFO_SIZE! */
#define MSG_FIFO_SIZE 65536 /* 65536 = 2^16 */ #define MSG_FIFO_SIZE 65536 /* 65536 = 2^16 */
@ -119,7 +118,6 @@ struct pi433_instance {
struct pi433_tx_cfg tx_cfg; struct pi433_tx_cfg tx_cfg;
}; };
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* GPIO interrupt handlers */ /* GPIO interrupt handlers */
@ -406,7 +404,6 @@ pi433_start_rx(struct pi433_device *dev)
return 0; return 0;
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static int static int
@ -526,7 +523,6 @@ pi433_receive(void *data)
else else
bytes_to_read = bytes_total - dev->rx_position; bytes_to_read = bytes_total - dev->rx_position;
/* access the fifo */ /* access the fifo */
if (bytes_to_read > FIFO_SIZE - dev->free_in_fifo) if (bytes_to_read > FIFO_SIZE - dev->free_in_fifo)
bytes_to_read = FIFO_SIZE - dev->free_in_fifo; bytes_to_read = FIFO_SIZE - dev->free_in_fifo;
@ -545,7 +541,6 @@ pi433_receive(void *data)
dev->rx_position += bytes_to_read; dev->rx_position += bytes_to_read;
} }
/* rx done, wait was interrupted or error occurred */ /* rx done, wait was interrupted or error occurred */
abort: abort:
dev->interrupt_rx_allowed = true; dev->interrupt_rx_allowed = true;
@ -737,7 +732,6 @@ pi433_tx_thread(void *data)
if (kthread_should_stop()) if (kthread_should_stop())
printk("ABORT\n"); printk("ABORT\n");
/* STOP_TRANSMISSION */ /* STOP_TRANSMISSION */
dev_dbg(device->dev, "thread: Packet sent. Set mode to stby."); dev_dbg(device->dev, "thread: Packet sent. Set mode to stby.");
retval = rf69_set_mode(spi, standby); retval = rf69_set_mode(spi, standby);
@ -804,7 +798,6 @@ pi433_read(struct file *filp, char __user *buf, size_t size, loff_t *f_pos)
return bytes_received; return bytes_received;
} }
static ssize_t static ssize_t
pi433_write(struct file *filp, const char __user *buf, pi433_write(struct file *filp, const char __user *buf,
size_t count, loff_t *f_pos) size_t count, loff_t *f_pos)
@ -854,7 +847,6 @@ abort:
return -EAGAIN; return -EAGAIN;
} }
static long static long
pi433_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) pi433_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{ {
@ -992,7 +984,6 @@ static int pi433_release(struct inode *inode, struct file *filp)
return 0; return 0;
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static int setup_GPIOs(struct pi433_device *device) static int setup_GPIOs(struct pi433_device *device)
@ -1028,14 +1019,12 @@ static int setup_GPIOs(struct pi433_device *device)
return retval; return retval;
} }
/* configure the pin */ /* configure the pin */
gpiod_unexport(device->gpiod[i]); gpiod_unexport(device->gpiod[i]);
retval = gpiod_direction_input(device->gpiod[i]); retval = gpiod_direction_input(device->gpiod[i]);
if (retval) if (retval)
return retval; return retval;
/* configure irq */ /* configure irq */
device->irq_num[i] = gpiod_to_irq(device->gpiod[i]); device->irq_num[i] = gpiod_to_irq(device->gpiod[i]);
if (device->irq_num[i] < 0) { if (device->irq_num[i] < 0) {

8
drivers/staging/pi433/pi433_if.h
View File

@ -32,9 +32,6 @@
#include <linux/types.h> #include <linux/types.h>
#include "rf69_enum.h" #include "rf69_enum.h"
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
enum option_on_off { enum option_on_off {
@ -76,7 +73,6 @@ struct pi433_tx_cfg {
__u16 repetitions; __u16 repetitions;
/* packet format */ /* packet format */
enum option_on_off enable_preamble; enum option_on_off enable_preamble;
enum option_on_off enable_sync; enum option_on_off enable_sync;
@ -92,7 +88,6 @@ struct pi433_tx_cfg {
__u8 address_byte; __u8 address_byte;
}; };
/** /**
* struct pi433_rx_config - describes the configuration of the radio module for sending * struct pi433_rx_config - describes the configuration of the radio module for sending
* @frequency: * @frequency:
@ -127,8 +122,6 @@ struct pi433_rx_cfg {
__u8 bw_exponent; /* during AFC: 0x8b */ __u8 bw_exponent; /* during AFC: 0x8b */
enum dagc dagc; enum dagc dagc;
/* packet format */ /* packet format */
enum option_on_off enable_sync; enum option_on_off enable_sync;
enum option_on_off enable_length_byte; /* should be used in combination with sync, only */ enum option_on_off enable_length_byte; /* should be used in combination with sync, only */
@ -144,7 +137,6 @@ struct pi433_rx_cfg {
__u8 broadcast_address; __u8 broadcast_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_RD_TX_CFG _IOR(PI433_IOC_MAGIC, PI433_TX_CFG_IOCTL_NR, char[sizeof(struct pi433_tx_cfg)])

2
drivers/staging/pi433/rf69.h
View File

@ -78,6 +78,4 @@ int rf69_write_fifo(struct spi_device *spi, u8 *buffer, unsigned int size);
u8 rf69_read_reg(struct spi_device *spi, u8 addr); u8 rf69_read_reg(struct spi_device *spi, u8 addr);
int rf69_write_reg(struct spi_device *spi, u8 addr, u8 value); int rf69_write_reg(struct spi_device *spi, u8 addr, u8 value);
#endif #endif

4
drivers/staging/pi433/rf69_registers.h
View File

@ -188,8 +188,6 @@
#define MASK_PALEVEL_PA2 0x20 #define MASK_PALEVEL_PA2 0x20
#define MASK_PALEVEL_OUTPUT_POWER 0x1F #define MASK_PALEVEL_OUTPUT_POWER 0x1F
// RegPaRamp // RegPaRamp
#define PARAMP_3400 0x00 #define PARAMP_3400 0x00
#define PARAMP_2000 0x01 #define PARAMP_2000 0x01
@ -246,7 +244,6 @@
#define LNA_GAIN_MAX_MINUS_36 0x05 #define LNA_GAIN_MAX_MINUS_36 0x05
#define LNA_GAIN_MAX_MINUS_48 0x06 #define LNA_GAIN_MAX_MINUS_48 0x06
/* RegRxBw (0x19) and RegAfcBw (0x1A) */ /* RegRxBw (0x19) and RegAfcBw (0x1A) */
#define MASK_BW_DCC_FREQ 0xE0 #define MASK_BW_DCC_FREQ 0xE0
#define MASK_BW_MANTISSE 0x18 #define MASK_BW_MANTISSE 0x18
@ -265,7 +262,6 @@
#define BW_MANT_20 0x08 #define BW_MANT_20 0x08
#define BW_MANT_24 0x10 /* default */ #define BW_MANT_24 0x10 /* default */
/* RegOokPeak (0x1B) */ /* RegOokPeak (0x1B) */
#define MASK_OOKPEAK_THRESTYPE 0xc0 #define MASK_OOKPEAK_THRESTYPE 0xc0
#define MASK_OOKPEAK_THRESSTEP 0x38 #define MASK_OOKPEAK_THRESSTEP 0x38