Remove obsolete code.

adapter_get_discover_type() has become obsolete. This patch removes it and
do the proper adaptation.
4 files changed