Use MAKEDISKDEV and DISKUNIT macros instead of rolling our own inline version of them.
Use MAKEDISKDEV and DISKUNIT macros instead of rolling our own inline version
of them.

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars