ublk: make ublk_ctrl_stop_dev return void

yoavcoh · axboe · commit 9e386f49fa26 · 2026-01-12T15:07:31.000-07: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;
Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
@@ -3459,10 +3459,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,
@@ -3935,7 +3934,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
`@@ -3459,10 +3459,9 @@ static inline void ublk_ctrl_cmd_dump(struct io_uring_cmd *cmd)`
`3459`	`3459`	`header->data[0], header->addr, header->len);`
`3460`	`3460`	`}`
`3461`	`3461`
`3462`		`-static int ublk_ctrl_stop_dev(struct ublk_device *ub)`
	`3462`	`+static void ublk_ctrl_stop_dev(struct ublk_device *ub)`
`3463`	`3463`	`{`
`3464`	`3464`	`ublk_stop_dev(ub);`
`3465`		`- return 0;`
`3466`	`3465`	`}`
`3467`	`3466`
`3468`	`3467`	`static int ublk_ctrl_get_dev_info(struct ublk_device *ub,`
`@@ -3935,7 +3934,8 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd,`
`3935`	`3934`	`ret = ublk_ctrl_start_dev(ub, header);`
`3936`	`3935`	`break;`
`3937`	`3936`	`case UBLK_CMD_STOP_DEV:`
`3938`		`- ret = ublk_ctrl_stop_dev(ub);`
	`3937`	`+ ublk_ctrl_stop_dev(ub);`
	`3938`	`+ ret = 0;`
`3939`	`3939`	`break;`
`3940`	`3940`	`case UBLK_CMD_GET_DEV_INFO:`
`3941`	`3941`	`case UBLK_CMD_GET_DEV_INFO2:`