2024-03-20 05:36:02

by Sam Edwards

[permalink] [raw]
Subject: [RESEND v2 RFC 2/5] i2c: mv64xxx: Clean up the private data struct

There are many fields in `struct mv64xxx_i2c_data` with `u32` type
despite this not being the correct type for those fields.

Change the types to accurately reflect what is being kept in each field.

Signed-off-by: Sam Edwards <[email protected]>
---
drivers/i2c/busses/i2c-mv64xxx.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index cfc16909fba3..bb048e655be7 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -83,7 +83,7 @@
#define MV64XXX_I2C_BRIDGE_STATUS_ERROR BIT(0)

/* Driver states */
-enum {
+enum mv64xxx_i2c_state {
MV64XXX_I2C_STATE_INVALID,
MV64XXX_I2C_STATE_IDLE,
MV64XXX_I2C_STATE_WAITING_FOR_START_COND,
@@ -95,7 +95,7 @@ enum {
};

/* Driver actions */
-enum {
+enum mv64xxx_i2c_action {
MV64XXX_I2C_ACTION_INVALID,
MV64XXX_I2C_ACTION_CONTINUE,
MV64XXX_I2C_ACTION_SEND_RESTART,
@@ -121,21 +121,21 @@ struct mv64xxx_i2c_data {
struct i2c_msg *msgs;
int num_msgs;
int irq;
- u32 state;
- u32 action;
- u32 aborting;
+ enum mv64xxx_i2c_state state;
+ enum mv64xxx_i2c_action action;
+ bool aborting;
u32 cntl_bits;
void __iomem *reg_base;
struct mv64xxx_i2c_regs reg_offsets;
- u32 addr1;
- u32 addr2;
- u32 bytes_left;
- u32 byte_posn;
- u32 send_stop;
- u32 block;
+ u8 addr1;
+ u8 addr2;
+ size_t bytes_left;
+ size_t byte_posn;
+ bool send_stop;
+ bool block;
int rc;
- u32 freq_m;
- u32 freq_n;
+ u8 freq_m;
+ u8 freq_n;
struct clk *clk;
struct clk *reg_clk;
wait_queue_head_t waitq;
--
2.43.2