i3c: master: Use unsigned int for dev_nack_retry_count consistently

Use unsigned int for dev_nack_retry_count across the core and
controller drivers to match the type of master->dev_nack_retry_count.

Update the sysfs store path to use kstrtouint() and adjust the
 ->set_dev_nack_retry() callback prototype and callers accordingly.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20260616113752.196140-4-adrian.hunter@intel.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index a24944047e30ca490a4de60b8c2ac37c60934619..f1be38a640ca11895130de85b4bfeee9252b2a6d 100644 (file)
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -760,10 +760,10 @@ static ssize_t dev_nack_retry_count_store(struct device *dev,
 {
        struct i3c_bus *i3cbus = dev_to_i3cbus(dev);
        struct i3c_master_controller *master = dev_to_i3cmaster(dev);
-       unsigned long val;
+       unsigned int val;
        int ret;
 
-       ret = kstrtoul(buf, 0, &val);
+       ret = kstrtouint(buf, 0, &val);
        if (ret)
                return ret;
 

diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c
index 971b429b76bc851137e83bf84d110daf82d9f179..2f8c0c4683e06c621353e63ce6091a3ef7294eb0 100644 (file)
--- a/drivers/i3c/master/dw-i3c-master.c
+++ b/drivers/i3c/master/dw-i3c-master.c
@@ -1485,7 +1485,7 @@ static irqreturn_t dw_i3c_master_irq_handler(int irq, void *dev_id)
 }
 
 static int dw_i3c_master_set_dev_nack_retry(struct i3c_master_controller *m,
-                                           unsigned long dev_nack_retry_cnt)
+                                           unsigned int dev_nack_retry_cnt)
 {
        struct dw_i3c_master *master = to_dw_i3c_master(m);
        u32 reg;
@@ -1493,7 +1493,7 @@ static int dw_i3c_master_set_dev_nack_retry(struct i3c_master_controller *m,
 
        if (dev_nack_retry_cnt > DW_I3C_DEV_NACK_RETRY_CNT_MAX) {
                dev_err(&master->base.dev,
-                       "Value %ld exceeds maximum %d\n",
+                       "Value %u exceeds maximum %d\n",
                        dev_nack_retry_cnt, DW_I3C_DEV_NACK_RETRY_CNT_MAX);
                return -ERANGE;
        }

diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h
index 27eeb598b3c5230732629985561794071e3068b9..4d2a6879332400365d280bfa8f7e057055b22d78 100644 (file)
--- a/include/linux/i3c/master.h
+++ b/include/linux/i3c/master.h
@@ -494,7 +494,7 @@ struct i3c_master_controller_ops {
        int (*disable_hotjoin)(struct i3c_master_controller *master);
        int (*set_speed)(struct i3c_master_controller *master, enum i3c_open_drain_speed speed);
        int (*set_dev_nack_retry)(struct i3c_master_controller *master,
-                                 unsigned long dev_nack_retry_cnt);
+                                 unsigned int dev_nack_retry_cnt);
 };
 
 /**