diff options
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/pi433/pi433_if.c | 11 | ||||
-rw-r--r-- | drivers/staging/pi433/pi433_if.h | 8 | ||||
-rw-r--r-- | drivers/staging/pi433/rf69.h | 2 | ||||
-rw-r--r-- | drivers/staging/pi433/rf69_registers.h | 4 |
4 files changed, 0 insertions, 25 deletions
diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c index 1f3ba552689e..b4e6094ad553 100644 --- a/drivers/staging/pi433/pi433_if.c +++ b/drivers/staging/pi433/pi433_if.c @@ -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 */ @@ -119,7 +118,6 @@ struct pi433_instance { struct pi433_tx_cfg tx_cfg; }; - /*-------------------------------------------------------------------------*/ /* GPIO interrupt handlers */ @@ -406,7 +404,6 @@ pi433_start_rx(struct pi433_device *dev) return 0; } - /*-------------------------------------------------------------------------*/ static int @@ -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; @@ -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; @@ -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); @@ -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) @@ -854,7 +847,6 @@ abort: return -EAGAIN; } - static long 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; } - /*-------------------------------------------------------------------------*/ static int setup_GPIOs(struct pi433_device *device) @@ -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) { diff --git a/drivers/staging/pi433/pi433_if.h b/drivers/staging/pi433/pi433_if.h index f67d3833c271..7314f69af198 100644 --- a/drivers/staging/pi433/pi433_if.h +++ b/drivers/staging/pi433/pi433_if.h @@ -34,9 +34,6 @@ /*---------------------------------------------------------------------------*/ - -/*---------------------------------------------------------------------------*/ - enum option_on_off { OPTION_OFF, OPTION_ON @@ -76,7 +73,6 @@ struct pi433_tx_cfg { __u16 repetitions; - /* packet format */ enum option_on_off enable_preamble; enum option_on_off enable_sync; @@ -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: @@ -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 */ @@ -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)]) diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h index dfc1a863d78c..079acbd8a366 100644 --- a/drivers/staging/pi433/rf69.h +++ b/drivers/staging/pi433/rf69.h @@ -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 diff --git a/drivers/staging/pi433/rf69_registers.h b/drivers/staging/pi433/rf69_registers.h index d23b8b668ef5..33fd91518bb0 100644 --- a/drivers/staging/pi433/rf69_registers.h +++ b/drivers/staging/pi433/rf69_registers.h @@ -188,8 +188,6 @@ #define MASK_PALEVEL_PA2 0x20 #define MASK_PALEVEL_OUTPUT_POWER 0x1F - - // RegPaRamp #define PARAMP_3400 0x00 #define PARAMP_2000 0x01 @@ -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 @@ -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 |