Fix a typo in r249213; the second bus_if.h should have been isa_if.h.
- Remove pointless returns.
- Make cm_data a void pointer and cm_flags unsigned as appropriate.

MFC after:	3 days