diff options
author | Simon Sandström <simon@nikanor.nu> | 2017-12-06 21:42:22 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-06 22:07:23 +0100 |
commit | c5a5bd6bdab597606ff80151dcf34159e21f3e8b (patch) | |
tree | e1438b13d4dabe7d158cd330062792b564829099 /drivers/staging/pi433 | |
parent | b92025a80c36f3e833f9a91a9d4802f0c7f40441 (diff) | |
download | op-kernel-dev-c5a5bd6bdab597606ff80151dcf34159e21f3e8b.zip op-kernel-dev-c5a5bd6bdab597606ff80151dcf34159e21f3e8b.tar.gz |
staging: pi433: Combine all rf69_set_amplifier_x()
Replaces the functions rf69_set_amplifier_1, _2, _3 with two
functions: rf69_enable_amplifier(dev, amp_mask) and
rf69_disable_amplifier(dev, amp_mask).
Signed-off-by: Simon Sandström <simon@nikanor.nu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/pi433')
-rw-r--r-- | drivers/staging/pi433/pi433_if.c | 6 | ||||
-rw-r--r-- | drivers/staging/pi433/rf69.c | 46 | ||||
-rw-r--r-- | drivers/staging/pi433/rf69.h | 8 |
3 files changed, 9 insertions, 51 deletions
diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c index 3b4170b..688d0cf 100644 --- a/drivers/staging/pi433/pi433_if.c +++ b/drivers/staging/pi433/pi433_if.c @@ -1126,9 +1126,9 @@ static int pi433_probe(struct spi_device *spi) /* setup the radio module */ SET_CHECKED(rf69_set_mode (spi, standby)); SET_CHECKED(rf69_set_data_mode (spi, DATAMODUL_MODE_PACKET)); - SET_CHECKED(rf69_set_amplifier_0 (spi, OPTION_ON)); - SET_CHECKED(rf69_set_amplifier_1 (spi, OPTION_OFF)); - SET_CHECKED(rf69_set_amplifier_2 (spi, OPTION_OFF)); + SET_CHECKED(rf69_enable_amplifier(spi, MASK_PALEVEL_PA0)); + SET_CHECKED(rf69_disable_amplifier(spi, MASK_PALEVEL_PA1)); + SET_CHECKED(rf69_disable_amplifier(spi, MASK_PALEVEL_PA2)); SET_CHECKED(rf69_set_output_power_level (spi, 13)); SET_CHECKED(rf69_set_antenna_impedance (spi, fiftyOhm)); diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c index 9f2ffb8..7140fa2 100644 --- a/drivers/staging/pi433/rf69.c +++ b/drivers/staging/pi433/rf69.c @@ -282,52 +282,14 @@ int rf69_set_frequency(struct spi_device *spi, u32 frequency) return 0; } -int rf69_set_amplifier_0(struct spi_device *spi, - enum option_on_off option_on_off) +int rf69_enable_amplifier(struct spi_device *spi, u8 amplifier_mask) { - #ifdef DEBUG - dev_dbg(&spi->dev, "set: amp #0"); - #endif - - switch (option_on_off) { - case OPTION_ON: return rf69_set_bit(spi, REG_PALEVEL, MASK_PALEVEL_PA0); - case OPTION_OFF: return rf69_clear_bit(spi, REG_PALEVEL, MASK_PALEVEL_PA0); - default: - dev_dbg(&spi->dev, "set: illegal input param"); - return -EINVAL; - } -} - -int rf69_set_amplifier_1(struct spi_device *spi, - enum option_on_off option_on_off) -{ - #ifdef DEBUG - dev_dbg(&spi->dev, "set: amp #1"); - #endif - - switch (option_on_off) { - case OPTION_ON: return rf69_set_bit(spi, REG_PALEVEL, MASK_PALEVEL_PA1); - case OPTION_OFF: return rf69_clear_bit(spi, REG_PALEVEL, MASK_PALEVEL_PA1); - default: - dev_dbg(&spi->dev, "set: illegal input param"); - return -EINVAL; - } + return rf69_set_bit(spi, REG_PALEVEL, amplifier_mask); } -int rf69_set_amplifier_2(struct spi_device *spi, - enum option_on_off option_on_off) +int rf69_disable_amplifier(struct spi_device *spi, u8 amplifier_mask) { - #ifdef DEBUG - dev_dbg(&spi->dev, "set: amp #2"); - #endif - - switch (option_on_off) { - case OPTION_ON: return rf69_set_bit(spi, REG_PALEVEL, MASK_PALEVEL_PA2); - case OPTION_OFF: return rf69_clear_bit(spi, REG_PALEVEL, MASK_PALEVEL_PA2); - default: - dev_dbg(&spi->dev, "set: illegal input param"); - return -EINVAL; - } + return rf69_clear_bit(spi, REG_PALEVEL, amplifier_mask); } int rf69_set_output_power_level(struct spi_device *spi, u8 powerLevel) diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h index 18296b4..ba25ab6 100644 --- a/drivers/staging/pi433/rf69.h +++ b/drivers/staging/pi433/rf69.h @@ -33,12 +33,8 @@ int rf69_set_modulation_shaping(struct spi_device *spi, enum mod_shaping mod_sha int rf69_set_bit_rate(struct spi_device *spi, u16 bitRate); int rf69_set_deviation(struct spi_device *spi, u32 deviation); int rf69_set_frequency(struct spi_device *spi, u32 frequency); -int rf69_set_amplifier_0(struct spi_device *spi, - enum option_on_off option_on_off); -int rf69_set_amplifier_1(struct spi_device *spi, - enum option_on_off option_on_off); -int rf69_set_amplifier_2(struct spi_device *spi, - enum option_on_off option_on_off); +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 powerLevel); int rf69_set_pa_ramp(struct spi_device *spi, enum paRamp paRamp); int rf69_set_antenna_impedance(struct spi_device *spi, enum antennaImpedance antennaImpedance); |