Index: sys/dev/cfi/cfi_core.c
===================================================================
--- sys/dev/cfi/cfi_core.c
+++ sys/dev/cfi/cfi_core.c
@@ -150,9 +150,9 @@
 {
        uint8_t val;
  
-   cfi_write(sc, CFI_QRY_CMD_ADDR * sc->sc_width, CFI_QRY_CMD_DATA); 
+ bus_space_write_1(sc->sc_tag, sc->sc_handle, CFI_QRY_CMD_ADDR * sc->sc_width, CFI_QRY_CMD_DATA);
        val = cfi_read(sc, ofs * sc->sc_width);
-   cfi_write(sc, 0, CFI_BCS_READ_ARRAY);
+ bus_space_write_1(sc->sc_tag, sc->sc_handle, 0, CFI_BCS_READ_ARRAY);
        return (val);
 }