Remove BUG_ON(), which is frowned upon and not needed here.
Restructure to remove some excessive complexity.
Signed-off-by: NFrank Rowand <frank.rowand@am.sony.com>
Signed-off-by: NRob Herring <robh@kernel.org>