Skip to content

Commit

Permalink
staging: pi433: remove multiple blank lines
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Valentin Vidic authored and Greg Kroah-Hartman committed Dec 19, 2017
1 parent 6106cfb commit 82a708e
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 25 deletions.
11 changes: 0 additions & 11 deletions drivers/staging/pi433/pi433_if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
#include "pi433_if.h"
#include "rf69.h"


#define N_PI433_MINORS (1U << MINORBITS) /*32*/ /* ... up to 256 */
#define MAX_MSG_SIZE 900 /* min: FIFO_SIZE! */
#define MSG_FIFO_SIZE 65536 /* 65536 = 2^16 */
Expand Down Expand Up @@ -119,7 +118,6 @@ struct pi433_instance {
struct pi433_tx_cfg tx_cfg;
};


/*-------------------------------------------------------------------------*/

/* GPIO interrupt handlers */
Expand Down Expand Up @@ -406,7 +404,6 @@ pi433_start_rx(struct pi433_device *dev)
return 0;
}


/*-------------------------------------------------------------------------*/

static int
Expand Down Expand Up @@ -526,7 +523,6 @@ pi433_receive(void *data)
else
bytes_to_read = bytes_total - dev->rx_position;


/* access the fifo */
if (bytes_to_read > FIFO_SIZE - dev->free_in_fifo)
bytes_to_read = FIFO_SIZE - dev->free_in_fifo;
Expand All @@ -545,7 +541,6 @@ pi433_receive(void *data)
dev->rx_position += bytes_to_read;
}


/* rx done, wait was interrupted or error occurred */
abort:
dev->interrupt_rx_allowed = true;
Expand Down Expand Up @@ -737,7 +732,6 @@ pi433_tx_thread(void *data)
if (kthread_should_stop())
printk("ABORT\n");


/* STOP_TRANSMISSION */
dev_dbg(device->dev, "thread: Packet sent. Set mode to stby.");
retval = rf69_set_mode(spi, standby);
Expand Down Expand Up @@ -804,7 +798,6 @@ pi433_read(struct file *filp, char __user *buf, size_t size, loff_t *f_pos)
return bytes_received;
}


static ssize_t
pi433_write(struct file *filp, const char __user *buf,
size_t count, loff_t *f_pos)
Expand Down Expand Up @@ -854,7 +847,6 @@ pi433_write(struct file *filp, const char __user *buf,
return -EAGAIN;
}


static long
pi433_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
Expand Down Expand Up @@ -992,7 +984,6 @@ static int pi433_release(struct inode *inode, struct file *filp)
return 0;
}


/*-------------------------------------------------------------------------*/

static int setup_GPIOs(struct pi433_device *device)
Expand Down Expand Up @@ -1028,14 +1019,12 @@ static int setup_GPIOs(struct pi433_device *device)
return retval;
}


/* configure the pin */
gpiod_unexport(device->gpiod[i]);
retval = gpiod_direction_input(device->gpiod[i]);
if (retval)
return retval;


/* configure irq */
device->irq_num[i] = gpiod_to_irq(device->gpiod[i]);
if (device->irq_num[i] < 0) {
Expand Down
8 changes: 0 additions & 8 deletions drivers/staging/pi433/pi433_if.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
#include <linux/types.h>
#include "rf69_enum.h"

/*---------------------------------------------------------------------------*/


/*---------------------------------------------------------------------------*/

enum option_on_off {
Expand Down Expand Up @@ -76,7 +73,6 @@ struct pi433_tx_cfg {

__u16 repetitions;


/* packet format */
enum option_on_off enable_preamble;
enum option_on_off enable_sync;
Expand All @@ -92,7 +88,6 @@ struct pi433_tx_cfg {
__u8 address_byte;
};


/**
* struct pi433_rx_config - describes the configuration of the radio module for sending
* @frequency:
Expand Down Expand Up @@ -127,8 +122,6 @@ struct pi433_rx_cfg {
__u8 bw_exponent; /* during AFC: 0x8b */
enum dagc dagc;



/* packet format */
enum option_on_off enable_sync;
enum option_on_off enable_length_byte; /* should be used in combination with sync, only */
Expand All @@ -144,7 +137,6 @@ struct pi433_rx_cfg {
__u8 broadcast_address;
};


#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)])
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/pi433/rf69.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
int rf69_write_reg(struct spi_device *spi, u8 addr, u8 value);


#endif
4 changes: 0 additions & 4 deletions drivers/staging/pi433/rf69_registers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,6 @@
#define MASK_PALEVEL_PA2 0x20
#define MASK_PALEVEL_OUTPUT_POWER 0x1F



// RegPaRamp
#define PARAMP_3400 0x00
#define PARAMP_2000 0x01
Expand Down Expand Up @@ -246,7 +244,6 @@
#define LNA_GAIN_MAX_MINUS_36 0x05
#define LNA_GAIN_MAX_MINUS_48 0x06


/* RegRxBw (0x19) and RegAfcBw (0x1A) */
#define MASK_BW_DCC_FREQ 0xE0
#define MASK_BW_MANTISSE 0x18
Expand All @@ -265,7 +262,6 @@
#define BW_MANT_20 0x08
#define BW_MANT_24 0x10 /* default */


/* RegOokPeak (0x1B) */
#define MASK_OOKPEAK_THRESTYPE 0xc0
#define MASK_OOKPEAK_THRESSTEP 0x38
Expand Down

0 comments on commit 82a708e

Please sign in to comment.