2024-02-27 22:12:56

by Shahar Avidar

Subject: [PATCH v2 0/5] 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
--
2.34.1

2024-02-27 22:13:26

by Shahar Avidar

Subject: [PATCH v2 2/5] staging: pi433: Remove a duplicated F_OSC define

F_OSC is already defined & only used by rf69.c source file.

Signed-off-by: Shahar Avidar <[email protected]>
---
drivers/staging/pi433/rf69.h | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h
index 78fa0b8bab8b..52e43a909b03 100644
--- a/drivers/staging/pi433/rf69.h
+++ b/drivers/staging/pi433/rf69.h
@@ -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 */
--
2.34.1

2024-02-27 22:13:42

by Shahar Avidar

Subject: [PATCH v2 3/5] staging: pi433: Redefine F_OSC using units.h macro

Use HZ_PER_MHZ for a more robust definition.

Suggested-by: Andy Shevchenko <[email protected]>
Signed-off-by: Shahar Avidar <[email protected]>
---
drivers/staging/pi433/rf69.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c
index b3b8d1abd3eb..5a1c362badb6 100644
--- a/drivers/staging/pi433/rf69.c
+++ b/drivers/staging/pi433/rf69.c
@@ -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)

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

--
2.34.1

2024-02-27 22:13:58

by Shahar Avidar

Subject: [PATCH v2 4/5] staging: pi433: Remove the unused FREQUENCY define

FREQUENCY is not being used, delete its comment.

Signed-off-by: Shahar Avidar <[email protected]>
---
drivers/staging/pi433/rf69.h | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h
index 52e43a909b03..e63e87fd6cce 100644
--- a/drivers/staging/pi433/rf69.h
+++ b/drivers/staging/pi433/rf69.h
@@ -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 */

--
2.34.1

2024-02-27 22:14:17

by Shahar Avidar

Subject: [PATCH v2 5/5] staging: pi433: Move FIFO_THRESHOLD define to source file

FIFO_THRESHOLD is only being used in pi433_if.c source files.

Signed-off-by: Shahar Avidar <[email protected]>
---
drivers/staging/pi433/pi433_if.c | 1 +
drivers/staging/pi433/rf69.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index 0ec3130225db..b6c4917d515e 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -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 2

static dev_t pi433_dev;
diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h
index e63e87fd6cce..76f0f9896a52 100644
--- a/drivers/staging/pi433/rf69.h
+++ b/drivers/staging/pi433/rf69.h
@@ -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);
--
2.34.1

2024-02-27 22:47:43

by Shahar Avidar

Subject: [PATCH v2 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.

Signed-off-by: Shahar Avidar <[email protected]>
---
drivers/staging/pi433/rf69.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c
index 8c7fab6a46bb..b3b8d1abd3eb 100644
--- a/drivers/staging/pi433/rf69.c
+++ b/drivers/staging/pi433/rf69.c
@@ -13,7 +13,6 @@
#include "rf69_registers.h"

#define F_OSC 32000000 /* in Hz */
-#define FIFO_SIZE 66 /* in byte */

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

--
2.34.1

2024-02-28 17:33:41

by Andy Shevchenko

Subject: Re: [PATCH v2 0/5] Fix defines in rf69.h

On Wed, Feb 28, 2024 at 12:11:59AM +0200, Shahar Avidar wrote:
> 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.

Good enough (esp. for staging),
Reviewed-by: Andy Shevchenko <[email protected]>

--
With Best Regards,
Andy Shevchenko