This reverts commit 84af7a61.

The conversion is done.

Cc: Ulf Magnusson <ulfalizer@gmail.com>
Signed-off-by: NMasahiro Yamada <masahiroy@kernel.org>