diff --git a/drivers/virt/haven/hh_dbl.c b/drivers/virt/haven/hh_dbl.c
index b3677f6c58bc..86afef1437fc 100644
--- a/drivers/virt/haven/hh_dbl.c
+++ b/drivers/virt/haven/hh_dbl.c
@@ -247,17 +247,14 @@ int hh_dbl_reset(void *dbl_client_desc)
 }
 EXPORT_SYMBOL(hh_dbl_reset);
 
-static irqreturn_t hh_dbl_rx_callback_thread(int irq, void *rx_priv_data)
+static irqreturn_t hh_dbl_rx_callback_thread(int irq, void *data)
 {
-	struct hh_dbl_cap_table *cap_table_entry;
-
-	cap_table_entry = container_of(rx_priv_data,
-				struct hh_dbl_cap_table, rx_priv_data);
+	struct hh_dbl_cap_table *cap_table_entry = data;
 
 	if (!cap_table_entry->rx_callback)
 		return IRQ_HANDLED;
 
-	cap_table_entry->rx_callback(irq, rx_priv_data);
+	cap_table_entry->rx_callback(irq, cap_table_entry->rx_priv_data);
 	return IRQ_HANDLED;
 }
 
@@ -373,7 +370,7 @@ void *hh_dbl_rx_register(enum hh_dbl_label label, dbl_rx_cb_t rx_cb, void *priv)
 				   hh_dbl_rx_callback_thread,
 				   IRQF_ONESHOT,
 				   cap_table_entry->rx_irq_name,
-				   priv);
+				   cap_table_entry);
 
 	if (ret < 0) {
 		pr_err("%s: IRQ registration failed\n", __func__);