summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2026-06-16 14:37:52 +0300
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2026-06-17 00:19:19 +0300
commit225b76e2a711dc061ec337befba49dd3ee75e534 (patch)
treed0801b9a6dd4303d618fcbda2ea298503d86e2b1
parent79ce29e100ab3de0cad66eb48d32a7de4043e2ae (diff)
downloadlinux-225b76e2a711dc061ec337befba49dd3ee75e534.tar.xz
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>
-rw-r--r--drivers/i3c/master.c4
-rw-r--r--drivers/i3c/master/dw-i3c-master.c4
-rw-r--r--include/linux/i3c/master.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index a24944047e30..f1be38a640ca 100644
--- 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 971b429b76bc..2f8c0c4683e0 100644
--- 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 27eeb598b3c5..4d2a68793324 100644
--- 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);
};
/**