diff --git a/module/bdev/null/bdev_null.c b/module/bdev/null/bdev_null.c
index 6f64b4f60..b13749348 100644
--- a/module/bdev/null/bdev_null.c
+++ b/module/bdev/null/bdev_null.c
@@ -1,8 +1,8 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright (c) Intel Corporation.
- *   All rights reserved.
+ *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -318,8 +318,7 @@ bdev_null_initialize(void)
 		goto end;
 	}
 
-	i = 0;
-	while (true) {
+	for (i = 0; ; ++i) {
 		val = spdk_conf_section_get_nval(sp, "Dev", i);
 		if (val == NULL) {
 			break;
@@ -362,8 +361,6 @@ bdev_null_initialize(void)
 			SPDK_ERRLOG("Could not create null bdev\n");
 			goto end;
 		}
-
-		i++;
 	}
 end:
 	if (rc) {