Revert "disk: Use a helper function to reduce duplication"

Per Takahiro Akashi this is not an equivalent rework, so revert it.

This reverts commit d87bdb82.

Signed-off-by: Tom Rini <trini@konsulko.com>