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

Commit db1bad52 authored by Marcin Ciupak's avatar Marcin Ciupak Committed by Greg Kroah-Hartman
Browse files

staging: pi433: make local functions static 



Following functions:
* rf69_get_modulation
* rf69_read_reg
* rf69_write_reg
are used locally only and should be declared as static

Signed-off-by: default avatarMarcin Ciupak <marcin.s.ciupak@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b78559b6

drivers/staging/pi433/rf69.c

+47 −47
Original line number Diff line number Diff line
@@ -33,6 +33,52 @@ 


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



static u8 rf69_read_reg(struct spi_device *spi, u8 addr)

{

	int retval;



	retval = spi_w8r8(spi, addr);



#ifdef DEBUG_VALUES

	if (retval < 0)

		/* should never happen, since we already checked,

		 * that module is connected. Therefore no error

		 * handling, just an optional error message...

		 */

		dev_dbg(&spi->dev, "read 0x%x FAILED\n", addr);

	else

		dev_dbg(&spi->dev, "read 0x%x from reg 0x%x\n", retval, addr);

#endif



	return retval;

}



static int rf69_write_reg(struct spi_device *spi, u8 addr, u8 value)

{

	int retval;

	char buffer[2];



	buffer[0] = addr | WRITE_BIT;

	buffer[1] = value;



	retval = spi_write(spi, &buffer, 2);



#ifdef DEBUG_VALUES

	if (retval < 0)

		/* should never happen, since we already checked,

		 * that module is connected. Therefore no error

		 * handling, just an optional error message...

		 */

		dev_dbg(&spi->dev, "write 0x%x to 0x%x FAILED\n", value, addr);

	else

		dev_dbg(&spi->dev, "wrote 0x%x to reg 0x%x\n", value, addr);

#endif



	return retval;

}



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



static int rf69_set_bit(struct spi_device *spi, u8 reg, u8 mask)

{

	u8 tmp;
@@ -96,7 +142,7 @@ int rf69_set_modulation(struct spi_device *spi, enum modulation modulation) 
	}

}



enum modulation rf69_get_modulation(struct spi_device *spi)

static enum modulation rf69_get_modulation(struct spi_device *spi)

{

	u8 currentValue;
@@ -796,49 +842,3 @@ int rf69_write_fifo(struct spi_device *spi, u8 *buffer, unsigned int size) 
	return spi_write(spi, local_buffer, size + 1);

}

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



u8 rf69_read_reg(struct spi_device *spi, u8 addr)

{

	int retval;



	retval = spi_w8r8(spi, addr);



#ifdef DEBUG_VALUES

	if (retval < 0)

		/* should never happen, since we already checked,

		 * that module is connected. Therefore no error

		 * handling, just an optional error message...

		 */

		dev_dbg(&spi->dev, "read 0x%x FAILED\n", addr);

	else

		dev_dbg(&spi->dev, "read 0x%x from reg 0x%x\n", retval, addr);

#endif



	return retval;

}



int rf69_write_reg(struct spi_device *spi, u8 addr, u8 value)

{

	int retval;

	char buffer[2];



	buffer[0] = addr | WRITE_BIT;

	buffer[1] = value;



	retval = spi_write(spi, &buffer, 2);



#ifdef DEBUG_VALUES

	if (retval < 0)

		/* should never happen, since we already checked,

		 * that module is connected. Therefore no error

		 * handling, just an optional error message...

		 */

		dev_dbg(&spi->dev, "write 0x%x to 0x%x FAILED\n", value, addr);

	else

		dev_dbg(&spi->dev, "wrote 0x%x to reg 0x%x\n", value, addr);

#endif



	return retval;

}

drivers/staging/pi433/rf69.h

+0 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
int rf69_set_mode(struct spi_device *spi, enum mode mode);

int rf69_set_data_mode(struct spi_device *spi, u8 data_mode);

int rf69_set_modulation(struct spi_device *spi, enum modulation modulation);

enum modulation rf69_get_modulation(struct spi_device *spi);

int rf69_set_modulation_shaping(struct spi_device *spi, enum mod_shaping mod_shaping);

int rf69_set_bit_rate(struct spi_device *spi, u16 bitRate);

int rf69_set_deviation(struct spi_device *spi, u32 deviation);
@@ -75,6 +74,4 @@ int rf69_set_dagc(struct spi_device *spi, enum dagc dagc); 
int rf69_read_fifo(struct spi_device *spi, u8 *buffer, unsigned int size);

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