Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5a5bd6b authored by Simon Sandström's avatar Simon Sandström Committed by Greg Kroah-Hartman
Browse files

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: default avatarSimon Sandström <simon@nikanor.nu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b92025a8

drivers/staging/pi433/pi433_if.c

+3 −3
Original line number Diff line number Diff line
@@ -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));

drivers/staging/pi433/rf69.c

+4 −42
Original line number Diff line number Diff line
@@ -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)

drivers/staging/pi433/rf69.h

+2 −6
Original line number Diff line number Diff line
@@ -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);