[PATCH 5/8] staging/rdma/hfi1: return early if setlink state was specified

ira.weiny at intel.com ira.weiny at intel.com
Wed Nov 11 05:43:06 UTC 2015


From: Ira Weiny <ira.weiny at intel.com>

Set link state was not supported and so we can return early in the parameter
checks rather than falling through the switch clause.

Signed-off-by: Dennis Dalessandro <dennis.dalessandro at intel.com>
Signed-off-by: Ira Weiny <ira.weiny at intel.com>
---
 drivers/staging/rdma/hfi1/diag.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rdma/hfi1/diag.c b/drivers/staging/rdma/hfi1/diag.c
index 556a47591989..a489a79dd3b6 100644
--- a/drivers/staging/rdma/hfi1/diag.c
+++ b/drivers/staging/rdma/hfi1/diag.c
@@ -999,16 +999,14 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
 		 * Other are invalid.
 		 */
 		return -EINVAL;
+	} else if (cmd == HFI1_SNOOP_IOCSETLINKSTATE) {
+		/* We do not support the old setlink state */
+		return -EINVAL;
 	}
 
 	spin_lock_irqsave(&dd->hfi1_snoop.snoop_lock, flags);
 
 	switch (cmd) {
-	case HFI1_SNOOP_IOCSETLINKSTATE:
-		snoop_dbg("HFI1_SNOOP_IOCSETLINKSTATE is not valid");
-		ret = -EINVAL;
-		break;
-
 	case HFI1_SNOOP_IOCSETLINKSTATE_EXTRA:
 		memset(&link_info, 0, sizeof(link_info));
 
-- 
1.8.2



More information about the devel mailing list