Fix defines in rf69.h
cover Fix defines in rf69.h
This patchset fixes several misuses of the define statement in rf69.h. Duplicted defines.
Define in header instead of source file.
Unused define.
Using units.h macro to define frequency.
v2->v1:
- Fix grammer in commit messages.
- Use units.h macro to define frequency.
- Reorder patches to ensure no conflicts.
Shahar Avidar (5):
staging: pi433: Remove a duplicated FIFO_SIZE define
staging: pi433: Remove a duplicated F_OSC define
staging: pi433: Redefine F_OSC using units.h macro
staging: pi433: Remove the unused FREQUENCY define
staging: pi433: Move FIFO_THRESHOLD define to source file
drivers/staging/pi433/pi433_if.c | 1 + drivers/staging/pi433/rf69.c | 4 ++-- drivers/staging/pi433/rf69.h | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-)
base-commit: 455c5e12a3b7d08c2ab47b7dd54944901c69cdcd
Signature · 1 line
2.34.1
PATCH 1/5 staging: pi433: Remove a duplicated FIFO_SIZE define
FIFO_SIZE is being used in both rf69.c & pi433_if.c source files. It is also already defined in rf69.h header file.
--- drivers/staging/pi433/rf69.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/pi433/rf69.c +0 -1
@@ -13,7 +13,6 @@#include "rf69_registers.h" #define F_OSC 32000000/* in Hz */ -#define FIFO_SIZE 66/* in byte */ /*-------------------------------------------------------------------------*/
Signature · 1 line
2.34.1
PATCH 2/5 staging: pi433: Remove a duplicated F_OSC define
In reply to Shahar AvidarF_OSC is already defined & only used by rf69.c source file.
--- drivers/staging/pi433/rf69.h | 1 - 1 file changed, 1 deletion(-)
drivers/staging/pi433/rf69.h +0 -1
@@ -12,7 +12,6 @@#include "rf69_registers.h" /* NOTE: Modifying FREQUENCY value impacts CE certification */ -#define F_OSC 32000000/* Hz */ #define FREQUENCY 433920000/* Hz */ #define FIFO_SIZE 66/* bytes */ #define FIFO_THRESHOLD 15/* bytes */
Signature · 1 line
2.34.1
PATCH 3/5 staging: pi433: Redefine F_OSC using units.h macro
In reply to Shahar AvidarUse HZ_PER_MHZ for a more robust definition.
--- drivers/staging/pi433/rf69.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/pi433/rf69.c +2 -1
@@ -8,11 +8,12 @@#include <linux/types.h> #include <linux/spi/spi.h> +#include <linux/units.h> #include "rf69.h" #include "rf69_registers.h" -#define F_OSC 32000000/* in Hz */ +#define F_OSC (32 * HZ_PER_MHZ)/*-------------------------------------------------------------------------*/
Signature · 1 line
2.34.1
PATCH 4/5 staging: pi433: Remove the unused FREQUENCY define
In reply to Shahar AvidarFREQUENCY is not being used, delete its comment.
--- drivers/staging/pi433/rf69.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/pi433/rf69.h +0 -2
@@ -11,8 +11,6 @@#include "rf69_enum.h" #include "rf69_registers.h" -/* NOTE: Modifying FREQUENCY value impacts CE certification */ -#define FREQUENCY 433920000/* Hz */ #define FIFO_SIZE 66/* bytes */ #define FIFO_THRESHOLD 15/* bytes */
Signature · 1 line
2.34.1
PATCH 5/5 staging: pi433: Move FIFO_THRESHOLD define to source file
In reply to Shahar AvidarFIFO_THRESHOLD is only being used in pi433_if.c source files.
--- drivers/staging/pi433/pi433_if.c | 1 + drivers/staging/pi433/rf69.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
drivers/staging/pi433/pi433_if.c +1 -0
@@ -49,6 +49,7 @@#define N_PI433_MINORS BIT(MINORBITS)/*32*/ /* ... up to 256 */ #define MAX_MSG_SIZE 900/* min: FIFO_SIZE! */ #define MSG_FIFO_SIZE 65536/* 65536 = 2^16 */ +#define FIFO_THRESHOLD 15/* bytes */ #define NUM_DIO 2static dev_t pi433_dev;
drivers/staging/pi433/rf69.h +0 -1
@@ -12,7 +12,6 @@#include "rf69_registers.h" #define FIFO_SIZE 66/* bytes */ -#define FIFO_THRESHOLD 15/* bytes */ u8 rf69_read_reg (struct spi_device *spi,u8 addr);int rf69_get_version (struct spi_device *spi);
Signature · 1 line
2.34.1