Modernize yang-data-spi a bit