* [PATCH v2 1/5] staging: pi433: Remove a duplicated FIFO_SIZE define
2024-02-27 22:11 [PATCH v2 0/5] Fix defines in rf69.h Shahar Avidar
@ 2024-02-27 22:12 ` Shahar Avidar
2024-02-27 22:12 ` [PATCH v2 2/5] staging: pi433: Remove a duplicated F_OSC define Shahar Avidar
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Shahar Avidar @ 2024-02-27 22:12 UTC (permalink / raw)
To: gregkh, luca.ceresoli, benjamin.tissoires, elder,
andriy.shevchenko, robh
Cc: linux-staging, linux-kernel
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 <ikobh7@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/5] staging: pi433: Remove a duplicated F_OSC define
2024-02-27 22:11 [PATCH v2 0/5] Fix defines in rf69.h Shahar Avidar
2024-02-27 22:12 ` [PATCH v2 1/5] staging: pi433: Remove a duplicated FIFO_SIZE define Shahar Avidar
@ 2024-02-27 22:12 ` Shahar Avidar
2024-02-27 22:12 ` [PATCH v2 3/5] staging: pi433: Redefine F_OSC using units.h macro Shahar Avidar
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Shahar Avidar @ 2024-02-27 22:12 UTC (permalink / raw)
To: gregkh, luca.ceresoli, benjamin.tissoires, elder,
andriy.shevchenko, robh
Cc: linux-staging, linux-kernel
F_OSC is already defined & only used by rf69.c source file.
Signed-off-by: Shahar Avidar <ikobh7@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 3/5] staging: pi433: Redefine F_OSC using units.h macro
2024-02-27 22:11 [PATCH v2 0/5] Fix defines in rf69.h Shahar Avidar
2024-02-27 22:12 ` [PATCH v2 1/5] staging: pi433: Remove a duplicated FIFO_SIZE define Shahar Avidar
2024-02-27 22:12 ` [PATCH v2 2/5] staging: pi433: Remove a duplicated F_OSC define Shahar Avidar
@ 2024-02-27 22:12 ` Shahar Avidar
2024-02-27 22:12 ` [PATCH v2 4/5] staging: pi433: Remove the unused FREQUENCY define Shahar Avidar
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Shahar Avidar @ 2024-02-27 22:12 UTC (permalink / raw)
To: gregkh, luca.ceresoli, benjamin.tissoires, elder,
andriy.shevchenko, robh
Cc: linux-staging, linux-kernel
Use HZ_PER_MHZ for a more robust definition.
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Shahar Avidar <ikobh7@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 4/5] staging: pi433: Remove the unused FREQUENCY define
2024-02-27 22:11 [PATCH v2 0/5] Fix defines in rf69.h Shahar Avidar
` (2 preceding siblings ...)
2024-02-27 22:12 ` [PATCH v2 3/5] staging: pi433: Redefine F_OSC using units.h macro Shahar Avidar
@ 2024-02-27 22:12 ` Shahar Avidar
2024-02-27 22:12 ` [PATCH v2 5/5] staging: pi433: Move FIFO_THRESHOLD define to source file Shahar Avidar
2024-02-28 17:32 ` [PATCH v2 0/5] Fix defines in rf69.h Andy Shevchenko
5 siblings, 0 replies; 7+ messages in thread
From: Shahar Avidar @ 2024-02-27 22:12 UTC (permalink / raw)
To: gregkh, luca.ceresoli, benjamin.tissoires, elder,
andriy.shevchenko, robh
Cc: linux-staging, linux-kernel
FREQUENCY is not being used, delete its comment.
Signed-off-by: Shahar Avidar <ikobh7@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 5/5] staging: pi433: Move FIFO_THRESHOLD define to source file
2024-02-27 22:11 [PATCH v2 0/5] Fix defines in rf69.h Shahar Avidar
` (3 preceding siblings ...)
2024-02-27 22:12 ` [PATCH v2 4/5] staging: pi433: Remove the unused FREQUENCY define Shahar Avidar
@ 2024-02-27 22:12 ` Shahar Avidar
2024-02-28 17:32 ` [PATCH v2 0/5] Fix defines in rf69.h Andy Shevchenko
5 siblings, 0 replies; 7+ messages in thread
From: Shahar Avidar @ 2024-02-27 22:12 UTC (permalink / raw)
To: gregkh, luca.ceresoli, benjamin.tissoires, elder,
andriy.shevchenko, robh
Cc: linux-staging, linux-kernel
FIFO_THRESHOLD is only being used in pi433_if.c source files.
Signed-off-by: Shahar Avidar <ikobh7@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 0/5] Fix defines in rf69.h
2024-02-27 22:11 [PATCH v2 0/5] Fix defines in rf69.h Shahar Avidar
` (4 preceding siblings ...)
2024-02-27 22:12 ` [PATCH v2 5/5] staging: pi433: Move FIFO_THRESHOLD define to source file Shahar Avidar
@ 2024-02-28 17:32 ` Andy Shevchenko
5 siblings, 0 replies; 7+ messages in thread
From: Andy Shevchenko @ 2024-02-28 17:32 UTC (permalink / raw)
To: Shahar Avidar
Cc: gregkh, luca.ceresoli, benjamin.tissoires, elder, robh,
linux-staging, linux-kernel
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 <andriy.shevchenko@linux.intel.com>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 7+ messages in thread