Revert "usb: core: Fix building with CONFIG_USB_OTG turned on."

This reverts commit 1668e55b986714ded4d5fccd3f717fca041f6391.
revert ...

This reverts commit c270f68e611a5dfa67f6ed8d1b02b7fb8edb2547.