This is partial revert for commit 3a02c1ae56a61c5249594553735ff32557e2e7ed
and only purpose is to sync these lines with mainline version and to have
common cleanup patch for both linux-omap and mainline.
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>