This reverts commit 1b17df99.

It causes merge issues in linux-next and was asked to be dropped from
this tree.
Reported-by: Thierry Reding <thierry.reding@gmail.com>
Cc: Wayne Chang <waynec@nvidia.com>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Jon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/Y8lEhwT3VWEn9w+R@oromeSigned-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>