ditto for DEVICE_INTR/CLEAR_INTR.  do_mfm/do_acsi/do_hd/... are
explicitly declared in the drivers that use DEVICE_INTR stuff;
DEVICE_INTR/CLEAR_INTR is gone from blk.h.