Merge branch 'for-5.12/dax' into libnvdimm-fixes

Pick up dax compile fix.
congwang · Apr 10, 2021 · 11d2498 · 11d2498
2 parents a2948b1 + 9de82ca
commit 11d2498
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c
@@ -90,13 +90,11 @@ static ssize_t do_id_store(struct device_driver *drv, const char *buf,
 				list_add(&dax_id->list, &dax_drv->ids);
 			} else
 				rc = -ENOMEM;
-		} else
-			/* nothing to remove */;
+		}
 	} else if (action == ID_REMOVE) {
 		list_del(&dax_id->list);
 		kfree(dax_id);
-	} else
-		/* dax_id already added */;
+	}
 	mutex_unlock(&dax_bus_lock);
 
 	if (rc < 0)