From 0a5fc5e0cd74074c5d0f8cb3f8d87afa2936a7d2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 7 Mar 2022 16:25:58 +0100
Subject: rhel8.5: Remove duplicate blkdev_register

---
 src/kernel/xloop_main_rhel_8.5.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/kernel/xloop_main_rhel_8.5.c b/src/kernel/xloop_main_rhel_8.5.c
index eb1538e..2ff67f8 100644
--- a/src/kernel/xloop_main_rhel_8.5.c
+++ b/src/kernel/xloop_main_rhel_8.5.c
@@ -2038,7 +2038,7 @@ static int __init xloop_init(void)
 	if (err < 0)
 		goto err_out;
 
-	if (register_blkdev(XLOOP_MAJOR, "xloop")) {
+	if (__register_blkdev(XLOOP_MAJOR, "xloop", xloop_probe)) {
 		err = -EIO;
 		goto misc_out;
 	}
@@ -2051,11 +2051,6 @@ static int __init xloop_init(void)
 	}
 #endif
 
-	if (__register_blkdev(XLOOP_MAJOR, "xloop", xloop_probe)) {
-		err = -EIO;
-		goto misc_out;
-	}
-
 	/* pre-create number of devices given by config or max_xloop */
 	mutex_lock(&xloop_ctl_mutex);
 	for (i = 0; i < nr; i++)
-- 
cgit v1.2.3-55-g7522