ublk: make ublk_ctrl_stop_dev return void

yoavcoh · kawasaki · commit 5d09d201df4a · 2026-01-09T13:56:53.000+09:00
This function always returns 0, so there is no need to return a value.

Signed-off-by: Yoav Cohen &lt;yoav@nvidia.com&gt;
Reviewed-by: Ming Lei &lt;ming.lei@redhat.com&gt;
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
@@ -3304,10 +3304,9 @@ static inline void ublk_ctrl_cmd_dump(struct io_uring_cmd *cmd)
 			header->data[0], header->addr, header->len);
 }
 
-static int ublk_ctrl_stop_dev(struct ublk_device *ub)
+static void ublk_ctrl_stop_dev(struct ublk_device *ub)
 {
 	ublk_stop_dev(ub);
-	return 0;
 }
 
 static int ublk_ctrl_get_dev_info(struct ublk_device *ub,
@@ -3780,7 +3779,8 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd,
 		ret = ublk_ctrl_start_dev(ub, header);
 		break;
 	case UBLK_CMD_STOP_DEV:
-		ret = ublk_ctrl_stop_dev(ub);
+		ublk_ctrl_stop_dev(ub);
+		ret = 0;
 		break;
 	case UBLK_CMD_GET_DEV_INFO:
 	case UBLK_CMD_GET_DEV_INFO2:

Original file line number	Diff line number	Diff line change
`@@ -3304,10 +3304,9 @@ static inline void ublk_ctrl_cmd_dump(struct io_uring_cmd *cmd)`
`3304`	`3304`	`header->data[0], header->addr, header->len);`
`3305`	`3305`	`}`
`3306`	`3306`
`3307`		`-static int ublk_ctrl_stop_dev(struct ublk_device *ub)`
	`3307`	`+static void ublk_ctrl_stop_dev(struct ublk_device *ub)`
`3308`	`3308`	`{`
`3309`	`3309`	`ublk_stop_dev(ub);`
`3310`		`- return 0;`
`3311`	`3310`	`}`
`3312`	`3311`
`3313`	`3312`	`static int ublk_ctrl_get_dev_info(struct ublk_device *ub,`
`@@ -3780,7 +3779,8 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd,`
`3780`	`3779`	`ret = ublk_ctrl_start_dev(ub, header);`
`3781`	`3780`	`break;`
`3782`	`3781`	`case UBLK_CMD_STOP_DEV:`
`3783`		`- ret = ublk_ctrl_stop_dev(ub);`
	`3782`	`+ ublk_ctrl_stop_dev(ub);`
	`3783`	`+ ret = 0;`
`3784`	`3784`	`break;`
`3785`	`3785`	`case UBLK_CMD_GET_DEV_INFO:`
`3786`	`3786`	`case UBLK_CMD_GET_DEV_INFO2:`