Versus upstream as requested

Last of the trivial switches to cable_detect methods.
Signed-off-by: NAlan Cox <alan@redhat.com>
Signed-off-by: NJeff Garzik <jeff@garzik.org>