Commit 6cc2d1a6 authored by Paulo Miguel Almeida's avatar Paulo Miguel Almeida Committed by Greg Kroah-Hartman
Browse files

staging: pi433: move get version func to where all other functions are 



As a convention for the pi433 driver, all routines that deals with the
rf69 chip are defined in the rf69.c file. There was an exception to the
rule in which the uC version verification was being done directly
elsewhere. While at it, the Version Register hardcoded value was
replaced with a pre-existing constant in the driver.

This patch adds rf69_get_version function to rf69.c

Signed-off-by: default avatarPaulo Miguel Almeida <paulo.miguel.almeida.rodenas@gmail.com>
Link: https://lore.kernel.org/r/20220108212728.GA7784@mail.google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f0fbfdf6

drivers/staging/pi433/pi433_if.c

+2 −2
Original line number Diff line number Diff line
@@ -1115,8 +1115,8 @@ static int pi433_probe(struct spi_device *spi) 
		"spi interface setup: mode 0x%2x, %d bits per word, %dhz max speed",

		spi->mode, spi->bits_per_word, spi->max_speed_hz);



	/* Ping the chip by reading the version register */

	retval = spi_w8r8(spi, 0x10);

	/* read chip version */

	retval = rf69_get_version(spi);

	if (retval < 0)

		return retval;

drivers/staging/pi433/rf69.c

+5 −0
Original line number Diff line number Diff line
@@ -102,6 +102,11 @@ static inline int rf69_read_mod_write(struct spi_device *spi, u8 reg, 


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



int rf69_get_version(struct spi_device *spi)

{

	return rf69_read_reg(spi, REG_VERSION);

}



int rf69_set_mode(struct spi_device *spi, enum mode mode)

{

	static const u8 mode_map[] = {

drivers/staging/pi433/rf69.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define FIFO_SIZE	66		/* bytes */

#define FIFO_THRESHOLD	15		/* bytes */



int rf69_get_version(struct spi_device *spi);

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);