diff --git a/ichspi.c b/ichspi.c
index 1f13b93..ff20f94 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -1693,32 +1693,32 @@
 }
 
 static const struct spi_master spi_master_ich7 = {
-	.max_data_read = 64,
-	.max_data_write = 64,
-	.command = ich_spi_send_command,
-	.multicommand = ich_spi_send_multicommand,
-	.read = default_spi_read,
-	.write_256 = default_spi_write_256,
-	.write_aai = default_spi_write_aai,
+	.max_data_read	= 64,
+	.max_data_write	= 64,
+	.command	= ich_spi_send_command,
+	.multicommand	= ich_spi_send_multicommand,
+	.read		= default_spi_read,
+	.write_256	= default_spi_write_256,
+	.write_aai	= default_spi_write_aai,
 };
 
 static const struct spi_master spi_master_ich9 = {
-	.max_data_read = 64,
-	.max_data_write = 64,
-	.command = ich_spi_send_command,
-	.multicommand = ich_spi_send_multicommand,
-	.read = default_spi_read,
-	.write_256 = default_spi_write_256,
-	.write_aai = default_spi_write_aai,
+	.max_data_read	= 64,
+	.max_data_write	= 64,
+	.command	= ich_spi_send_command,
+	.multicommand	= ich_spi_send_multicommand,
+	.read		= default_spi_read,
+	.write_256	= default_spi_write_256,
+	.write_aai	= default_spi_write_aai,
 };
 
 static const struct opaque_master opaque_master_ich_hwseq = {
-	.max_data_read = 64,
-	.max_data_write = 64,
-	.probe = ich_hwseq_probe,
-	.read = ich_hwseq_read,
-	.write = ich_hwseq_write,
-	.erase = ich_hwseq_block_erase,
+	.max_data_read	= 64,
+	.max_data_write	= 64,
+	.probe		= ich_hwseq_probe,
+	.read		= ich_hwseq_read,
+	.write		= ich_hwseq_write,
+	.erase		= ich_hwseq_block_erase,
 };
 
 int ich_init_spi(void *spibar, enum ich_chipset ich_gen)
@@ -2070,13 +2070,13 @@
 }
 
 static const struct spi_master spi_master_via = {
-	.max_data_read = 16,
-	.max_data_write = 16,
-	.command = ich_spi_send_command,
-	.multicommand = ich_spi_send_multicommand,
-	.read = default_spi_read,
-	.write_256 = default_spi_write_256,
-	.write_aai = default_spi_write_aai,
+	.max_data_read	= 16,
+	.max_data_write	= 16,
+	.command	= ich_spi_send_command,
+	.multicommand	= ich_spi_send_multicommand,
+	.read		= default_spi_read,
+	.write_256	= default_spi_write_256,
+	.write_aai	= default_spi_write_aai,
 };
 
 int via_init_spi(uint32_t mmio_base)