This reverts commit 0f4048e1a0c6e9d3d31ce5b684600fd137cebfca which is commit 319e6ac143b9e9048e527ab9dd2aabb8fdf3d60f upstream. It breaks the 6.1.y build, so needs to be reverted. Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Cc: Mark Brown <broonie@kernel.org> Cc: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>