This reverts commit 28a5529068 which is
commit 794aaf01444d4e765e2b067cba01cc69c1c68ed9 upstream.
It breaks the abi for SPI drivers and shouldn't be a problem for Android
devices.
Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6bfd496ebbdcc490058e9e6c29ab29b8fee57b3e