Fold __ublk_create_dev into its only caller to avoid the packing and
unpacking of the return value into an ERR_PTR.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Ming Lei <ming.lei@xxxxxxxxxx>
Reviewed-by: ZiyangZhang <ZiyangZhang@xxxxxxxxxxxxxxxxx>
---
drivers/block/ublk_drv.c | 28 ++++++++--------------------
1 file changed, 8 insertions(+), 20 deletions(-)
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index 2032d677b9f18..b8ac7b508029e 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -1017,23 +1017,6 @@ static int __ublk_alloc_dev_number(struct ublk_device *ub, int idx)
return err;
}
-static struct ublk_device *__ublk_create_dev(int idx)
-{
- struct ublk_device *ub = NULL;
- int ret;
-
- ub = kzalloc(sizeof(*ub), GFP_KERNEL);
- if (!ub)
- return ERR_PTR(-ENOMEM);
-
- ret = __ublk_alloc_dev_number(ub, idx);
- if (ret < 0) {
- kfree(ub);
- return ERR_PTR(ret);
- }
- return ub;
-}
-
static void __ublk_destroy_dev(struct ublk_device *ub)
{
spin_lock(&ublk_idr_lock);
@@ -1357,9 +1340,14 @@ static int ublk_ctrl_add_dev(struct io_uring_cmd *cmd)
if (ret)
return ret;
- ub = __ublk_create_dev(header->dev_id);
- if (IS_ERR(ub)) {
- ret = PTR_ERR(ub);
+ ret = -ENOMEM;
+ ub = kzalloc(sizeof(*ub), GFP_KERNEL);
+ if (!ub)
+ goto out_unlock;
+
+ ret = __ublk_alloc_dev_number(ub, header->dev_id);
+ if (ret < 0) {
+ kfree(ub);
goto out_unlock;
}
--
2.30.2
