2024-03-27 19:10:20

by Shahar Avidar

Subject: [PATCH v3 0/3] staging: pi433: Fix includes, comments & macros.

This patchset continues with some cleanups:

1. Untangle include hierarchy.
2. Delete a misleading comment.
3. Make use of general macro instead of magic number.

v2->v1:
Undo macro update. Remove its inaccurate comment instead.
v2->v3:
Restore Reviewed-by tag, previously omitted from patches 1 & 3.

Shahar Avidar (3):
staging: pi433: Use headers in appropriate files.
staging: pi433: Remove an inaccurate comment.
staging: pi433: Make use of spi mode macro instead of magic number.

drivers/staging/pi433/pi433_if.c | 5 +++--
drivers/staging/pi433/rf69.c | 1 +
drivers/staging/pi433/rf69.h | 1 -
3 files changed, 4 insertions(+), 3 deletions(-)


base-commit: 20952655235dd9b1447829591774f1d8561f7c6a
--
2.34.1

2024-03-27 19:10:31

by Shahar Avidar

Subject: [PATCH v3 1/3] staging: pi433: Use headers in appropriate files.

Ensure rf69.c directly includes rf69_enum.h.
Move rf69_registers.h from header to the relevant source file.

Reviewed-by: Andy Shevchenko <[email protected]>
Signed-off-by: Shahar Avidar <[email protected]>
---
v2->v3:
Restore Reviewed-by tag.

drivers/staging/pi433/pi433_if.c | 1 +
drivers/staging/pi433/rf69.c | 1 +
drivers/staging/pi433/rf69.h | 1 -
3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index 81de98c0245a..0c12b31c4642 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -45,6 +45,7 @@

#include "pi433_if.h"
#include "rf69.h"
+#include "rf69_registers.h"

#define N_PI433_MINORS BIT(MINORBITS) /*32*/ /* ... up to 256 */
#define MAX_MSG_SIZE 900 /* min: FIFO_SIZE! */
diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c
index 5a1c362badb6..bf802f097310 100644
--- a/drivers/staging/pi433/rf69.c
+++ b/drivers/staging/pi433/rf69.c
@@ -11,6 +11,7 @@
#include <linux/units.h>

#include "rf69.h"
+#include "rf69_enum.h"
#include "rf69_registers.h"

#define F_OSC (32 * HZ_PER_MHZ)
diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h
index 76f0f9896a52..dd6fa8af9b9c 100644
--- a/drivers/staging/pi433/rf69.h
+++ b/drivers/staging/pi433/rf69.h
@@ -9,7 +9,6 @@
#define RF69_H

#include "rf69_enum.h"
-#include "rf69_registers.h"

#define FIFO_SIZE 66 /* bytes */

--
2.34.1

2024-03-27 19:10:41

by Shahar Avidar

Subject: [PATCH v3 2/3] staging: pi433: Remove an inaccurate comment.

The comment specified the wrong number represented by the macro.

Signed-off-by: Shahar Avidar <[email protected]>
---
v1->v2:
Undo macro change. Remove comment instead.

drivers/staging/pi433/pi433_if.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index 0c12b31c4642..ec9f07a4f769 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -47,7 +47,7 @@
#include "rf69.h"
#include "rf69_registers.h"

-#define N_PI433_MINORS BIT(MINORBITS) /*32*/ /* ... up to 256 */
+#define N_PI433_MINORS BIT(MINORBITS)
#define MAX_MSG_SIZE 900 /* min: FIFO_SIZE! */
#define MSG_FIFO_SIZE 65536 /* 65536 = 2^16 */
#define FIFO_THRESHOLD 15 /* bytes */
--
2.34.1

2024-03-27 19:10:55

by Shahar Avidar

Subject: [PATCH v3 3/3] staging: pi433: Make use of spi mode macro instead of magic number.

Use SPI_MODE_0 to setup spi mode.

Reviewed-by: Andy Shevchenko <[email protected]>
Signed-off-by: Shahar Avidar <[email protected]>
---
v2->v3:
Restore Reviewed-by tag.

drivers/staging/pi433/pi433_if.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index ec9f07a4f769..8c513ac62156 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -1164,7 +1164,7 @@ static int pi433_probe(struct spi_device *spi)
struct dentry *entry;

/* setup spi parameters */
- spi->mode = 0x00;
+ spi->mode = SPI_MODE_0;
spi->bits_per_word = 8;
/*
* spi->max_speed_hz = 10000000;
--
2.34.1