Clean up previous commit, make dumpstat independent of int SPI::dev