Skip to contentSkip to conversation

IB/qib: cleanup qib_register_observer()

PATCH In review Dan Carpenter 2 participants 3 messages Jan 30, 2014 – Feb 24, 2014 1 message not in the archive

Subsystems (2)
Kernel janitors InfiniBand
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 IB/qib: cleanup qib_register_observer()

Returning directly is easier to read than do-nothing gotos. Remove the duplicative check on "olp" and pulled the code in one indent level.

Signed-off-by Dan Carpenter <[email protected]>
drivers/infiniband/hw/qib/qib_diag.c +10 -15
index 1686fd4bda87..52601ae4b327 100644
@@ -689,28 +689,23 @@ int qib_register_observer(struct qib_devdata *dd,
 			  const struct diag_observer *op)
 {
 	struct diag_observer_list_elt *olp;
-	int ret = -EINVAL;
+	unsigned long flags;
 
 	if (!dd || !op)
-		goto bail;
-	ret = -ENOMEM;
+		return -EINVAL;
 	olp = vmalloc(sizeof *olp);
 	if (!olp) {
 		pr_err("vmalloc for observer failed\n");
-		goto bail;
+		return -ENOMEM;
 	}
-	if (olp) {
-		unsigned long flags;
 
-		spin_lock_irqsave(&dd->qib_diag_trans_lock, flags);
-		olp->op = op;
-		olp->next = dd->diag_observer_list;
-		dd->diag_observer_list = olp;
-		spin_unlock_irqrestore(&dd->qib_diag_trans_lock, flags);
-		ret = 0;
-	}
-bail:
-	return ret;
+	spin_lock_irqsave(&dd->qib_diag_trans_lock, flags);
+	olp->op = op;
+	olp->next = dd->diag_observer_list;
+	dd->diag_observer_list = olp;
+	spin_unlock_irqrestore(&dd->qib_diag_trans_lock, flags);
+
+	return 0;
 }
 
 /* Remove all registered observers when device is closed */

A message that is not in the archive (sent off-list or not yet received): [email protected]