spi/sf: Minor cleanups