diff --git a/atahpt.c b/atahpt.c
index a064deb..4a37870 100644
--- a/atahpt.c
+++ b/atahpt.c
@@ -44,14 +44,14 @@
 static uint8_t atahpt_chip_readb(const struct flashctx *flash,
 				 const chipaddr addr);
 static const struct par_master par_master_atahpt = {
-		.chip_readb		= atahpt_chip_readb,
-		.chip_readw		= fallback_chip_readw,
-		.chip_readl		= fallback_chip_readl,
-		.chip_readn		= fallback_chip_readn,
-		.chip_writeb		= atahpt_chip_writeb,
-		.chip_writew		= fallback_chip_writew,
-		.chip_writel		= fallback_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= atahpt_chip_readb,
+	.chip_readw	= fallback_chip_readw,
+	.chip_readl	= fallback_chip_readl,
+	.chip_readn	= fallback_chip_readn,
+	.chip_writeb	= atahpt_chip_writeb,
+	.chip_writew	= fallback_chip_writew,
+	.chip_writel	= fallback_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 static int atahpt_init(void)
diff --git a/atapromise.c b/atapromise.c
index 747a7fb..c561a3c 100644
--- a/atapromise.c
+++ b/atapromise.c
@@ -57,14 +57,14 @@
 static uint8_t atapromise_chip_readb(const struct flashctx *flash, const chipaddr addr);
 
 static const struct par_master par_master_atapromise = {
-		.chip_readb		= atapromise_chip_readb,
-		.chip_readw		= fallback_chip_readw,
-		.chip_readl		= fallback_chip_readl,
-		.chip_readn		= fallback_chip_readn,
-		.chip_writeb		= atapromise_chip_writeb,
-		.chip_writew		= fallback_chip_writew,
-		.chip_writel		= fallback_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= atapromise_chip_readb,
+	.chip_readw	= fallback_chip_readw,
+	.chip_readl	= fallback_chip_readl,
+	.chip_readn	= fallback_chip_readn,
+	.chip_writeb	= atapromise_chip_writeb,
+	.chip_writew	= fallback_chip_writew,
+	.chip_writel	= fallback_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 static void *atapromise_map(const char *descr, uintptr_t phys_addr, size_t len)
diff --git a/atavia.c b/atavia.c
index 50e9610..7be8959 100644
--- a/atavia.c
+++ b/atavia.c
@@ -57,14 +57,14 @@
 static void atavia_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr);
 static uint8_t atavia_chip_readb(const struct flashctx *flash, const chipaddr addr);
 static const struct par_master lpc_master_atavia = {
-		.chip_readb		= atavia_chip_readb,
-		.chip_readw		= fallback_chip_readw,
-		.chip_readl		= fallback_chip_readl,
-		.chip_readn		= fallback_chip_readn,
-		.chip_writeb		= atavia_chip_writeb,
-		.chip_writew		= fallback_chip_writew,
-		.chip_writel		= fallback_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= atavia_chip_readb,
+	.chip_readw	= fallback_chip_readw,
+	.chip_readl	= fallback_chip_readl,
+	.chip_readn	= fallback_chip_readn,
+	.chip_writeb	= atavia_chip_writeb,
+	.chip_writew	= fallback_chip_writew,
+	.chip_writel	= fallback_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 static void *atavia_offset = NULL;
diff --git a/developerbox_spi.c b/developerbox_spi.c
index a14f695..5a9c08d 100644
--- a/developerbox_spi.c
+++ b/developerbox_spi.c
@@ -121,11 +121,11 @@
 }
 
 static const struct bitbang_spi_master bitbang_spi_master_cp210x = {
-	.set_cs = cp210x_bitbang_set_cs,
-	.set_sck = cp210x_bitbang_set_sck,
-	.set_mosi = cp210x_bitbang_set_mosi,
-	.get_miso = cp210x_bitbang_get_miso,
-	.set_sck_set_mosi = cp210x_bitbang_set_sck_set_mosi,
+	.set_cs			= cp210x_bitbang_set_cs,
+	.set_sck		= cp210x_bitbang_set_sck,
+	.set_mosi		= cp210x_bitbang_set_mosi,
+	.get_miso		= cp210x_bitbang_get_miso,
+	.set_sck_set_mosi	= cp210x_bitbang_set_sck_set_mosi,
 };
 
 static int developerbox_spi_shutdown(void *data)
diff --git a/drkaiser.c b/drkaiser.c
index 0c0655d..379fff9 100644
--- a/drkaiser.c
+++ b/drkaiser.c
@@ -42,14 +42,14 @@
 static uint8_t drkaiser_chip_readb(const struct flashctx *flash,
 				   const chipaddr addr);
 static const struct par_master par_master_drkaiser = {
-		.chip_readb		= drkaiser_chip_readb,
-		.chip_readw		= fallback_chip_readw,
-		.chip_readl		= fallback_chip_readl,
-		.chip_readn		= fallback_chip_readn,
-		.chip_writeb		= drkaiser_chip_writeb,
-		.chip_writew		= fallback_chip_writew,
-		.chip_writel		= fallback_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= drkaiser_chip_readb,
+	.chip_readw	= fallback_chip_readw,
+	.chip_readl	= fallback_chip_readl,
+	.chip_readn	= fallback_chip_readn,
+	.chip_writeb	= drkaiser_chip_writeb,
+	.chip_writew	= fallback_chip_writew,
+	.chip_writel	= fallback_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 static int drkaiser_init(void)
diff --git a/dummyflasher.c b/dummyflasher.c
index c352601..e4b7bc0 100644
--- a/dummyflasher.c
+++ b/dummyflasher.c
@@ -124,14 +124,14 @@
 };
 
 static struct par_master par_master_dummy = {
-		.chip_readb		= dummy_chip_readb,
-		.chip_readw		= dummy_chip_readw,
-		.chip_readl		= dummy_chip_readl,
-		.chip_readn		= dummy_chip_readn,
-		.chip_writeb		= dummy_chip_writeb,
-		.chip_writew		= dummy_chip_writew,
-		.chip_writel		= dummy_chip_writel,
-		.chip_writen		= dummy_chip_writen,
+	.chip_readb	= dummy_chip_readb,
+	.chip_readw	= dummy_chip_readw,
+	.chip_readl	= dummy_chip_readl,
+	.chip_readn	= dummy_chip_readn,
+	.chip_writeb	= dummy_chip_writeb,
+	.chip_writew	= dummy_chip_writew,
+	.chip_writel	= dummy_chip_writel,
+	.chip_writen	= dummy_chip_writen,
 };
 
 static int dummy_shutdown(void *data)
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)
diff --git a/internal.c b/internal.c
index ddfdc54..e630105 100644
--- a/internal.c
+++ b/internal.c
@@ -136,14 +136,14 @@
 static void internal_chip_readn(const struct flashctx *flash, uint8_t *buf,
 				const chipaddr addr, size_t len);
 static const struct par_master par_master_internal = {
-		.chip_readb		= internal_chip_readb,
-		.chip_readw		= internal_chip_readw,
-		.chip_readl		= internal_chip_readl,
-		.chip_readn		= internal_chip_readn,
-		.chip_writeb		= internal_chip_writeb,
-		.chip_writew		= internal_chip_writew,
-		.chip_writel		= internal_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= internal_chip_readb,
+	.chip_readw	= internal_chip_readw,
+	.chip_readl	= internal_chip_readl,
+	.chip_readn	= internal_chip_readn,
+	.chip_writeb	= internal_chip_writeb,
+	.chip_writew	= internal_chip_writew,
+	.chip_writel	= internal_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 enum chipbustype internal_buses_supported = BUS_NONE;
diff --git a/it8212.c b/it8212.c
index 8953e34..4c7f9ee 100644
--- a/it8212.c
+++ b/it8212.c
@@ -35,14 +35,14 @@
 static void it8212_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr);
 static uint8_t it8212_chip_readb(const struct flashctx *flash, const chipaddr addr);
 static const struct par_master par_master_it8212 = {
-		.chip_readb		= it8212_chip_readb,
-		.chip_readw		= fallback_chip_readw,
-		.chip_readl		= fallback_chip_readl,
-		.chip_readn		= fallback_chip_readn,
-		.chip_writeb		= it8212_chip_writeb,
-		.chip_writew		= fallback_chip_writew,
-		.chip_writel		= fallback_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= it8212_chip_readb,
+	.chip_readw	= fallback_chip_readw,
+	.chip_readl	= fallback_chip_readl,
+	.chip_readn	= fallback_chip_readn,
+	.chip_writeb	= it8212_chip_writeb,
+	.chip_writew	= fallback_chip_writew,
+	.chip_writel	= fallback_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 static int it8212_init(void)
diff --git a/mcp6x_spi.c b/mcp6x_spi.c
index b53d07b..96d09f4 100644
--- a/mcp6x_spi.c
+++ b/mcp6x_spi.c
@@ -88,13 +88,13 @@
 }
 
 static const struct bitbang_spi_master bitbang_spi_master_mcp6x = {
-	.set_cs = mcp6x_bitbang_set_cs,
-	.set_sck = mcp6x_bitbang_set_sck,
-	.set_mosi = mcp6x_bitbang_set_mosi,
-	.get_miso = mcp6x_bitbang_get_miso,
-	.request_bus = mcp6x_request_spibus,
-	.release_bus = mcp6x_release_spibus,
-	.half_period = 0,
+	.set_cs		= mcp6x_bitbang_set_cs,
+	.set_sck	= mcp6x_bitbang_set_sck,
+	.set_mosi	= mcp6x_bitbang_set_mosi,
+	.get_miso	= mcp6x_bitbang_get_miso,
+	.request_bus	= mcp6x_request_spibus,
+	.release_bus	= mcp6x_release_spibus,
+	.half_period	= 0,
 };
 
 int mcp6x_spi_init(int want_spi)
diff --git a/mstarddc_spi.c b/mstarddc_spi.c
index 248dba6..9c53f14 100644
--- a/mstarddc_spi.c
+++ b/mstarddc_spi.c
@@ -220,13 +220,13 @@
 }
 
 static const struct spi_master spi_master_mstarddc = {
-	.max_data_read = 256,
-	.max_data_write = 256,
-	.command = mstarddc_spi_send_command,
-	.multicommand = default_spi_send_multicommand,
-	.read = default_spi_read,
-	.write_256 = default_spi_write_256,
-	.write_aai = default_spi_write_aai,
+	.max_data_read	= 256,
+	.max_data_write	= 256,
+	.command	= mstarddc_spi_send_command,
+	.multicommand	= default_spi_send_multicommand,
+	.read		= default_spi_read,
+	.write_256	= default_spi_write_256,
+	.write_aai	= default_spi_write_aai,
 };
 
 const struct programmer_entry programmer_mstarddc_spi = {
diff --git a/ni845x_spi.c b/ni845x_spi.c
index 2834798..f6f4fe8 100644
--- a/ni845x_spi.c
+++ b/ni845x_spi.c
@@ -632,13 +632,13 @@
 }
 
 static const struct spi_master spi_programmer_ni845x = {
-	.max_data_read = MAX_DATA_READ_UNLIMITED,
-	.max_data_write = MAX_DATA_WRITE_UNLIMITED,
-	.command = ni845x_spi_transmit,
-	.multicommand = default_spi_send_multicommand,
-	.read = default_spi_read,
-	.write_256 = default_spi_write_256,
-	.write_aai = default_spi_write_aai,
+	.max_data_read	= MAX_DATA_READ_UNLIMITED,
+	.max_data_write	= MAX_DATA_WRITE_UNLIMITED,
+	.command	= ni845x_spi_transmit,
+	.multicommand	= default_spi_send_multicommand,
+	.read		= default_spi_read,
+	.write_256	= default_spi_write_256,
+	.write_aai	= default_spi_write_aai,
 };
 
 const struct programmer_entry programmer_ni845x_spi = {
diff --git a/nic3com.c b/nic3com.c
index 94442df..cbc07d9 100644
--- a/nic3com.c
+++ b/nic3com.c
@@ -58,14 +58,14 @@
 static uint8_t nic3com_chip_readb(const struct flashctx *flash,
 				  const chipaddr addr);
 static const struct par_master par_master_nic3com = {
-		.chip_readb		= nic3com_chip_readb,
-		.chip_readw		= fallback_chip_readw,
-		.chip_readl		= fallback_chip_readl,
-		.chip_readn		= fallback_chip_readn,
-		.chip_writeb		= nic3com_chip_writeb,
-		.chip_writew		= fallback_chip_writew,
-		.chip_writel		= fallback_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= nic3com_chip_readb,
+	.chip_readw	= fallback_chip_readw,
+	.chip_readl	= fallback_chip_readl,
+	.chip_readn	= fallback_chip_readn,
+	.chip_writeb	= nic3com_chip_writeb,
+	.chip_writew	= fallback_chip_writew,
+	.chip_writel	= fallback_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 static int nic3com_shutdown(void *data)
diff --git a/nicintel.c b/nicintel.c
index 30f9dd0..f4cd39e 100644
--- a/nicintel.c
+++ b/nicintel.c
@@ -45,14 +45,14 @@
 static uint8_t nicintel_chip_readb(const struct flashctx *flash,
 				   const chipaddr addr);
 static const struct par_master par_master_nicintel = {
-		.chip_readb		= nicintel_chip_readb,
-		.chip_readw		= fallback_chip_readw,
-		.chip_readl		= fallback_chip_readl,
-		.chip_readn		= fallback_chip_readn,
-		.chip_writeb		= nicintel_chip_writeb,
-		.chip_writew		= fallback_chip_writew,
-		.chip_writel		= fallback_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= nicintel_chip_readb,
+	.chip_readw	= fallback_chip_readw,
+	.chip_readl	= fallback_chip_readl,
+	.chip_readn	= fallback_chip_readn,
+	.chip_writeb	= nicintel_chip_writeb,
+	.chip_writew	= fallback_chip_writew,
+	.chip_writel	= fallback_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 static int nicintel_init(void)
diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c
index 7181e7f..5f9e0f9 100644
--- a/nicintel_eeprom.c
+++ b/nicintel_eeprom.c
@@ -396,17 +396,17 @@
 }
 
 static const struct opaque_master opaque_master_nicintel_ee_82580 = {
-	.probe = nicintel_ee_probe_82580,
-	.read = nicintel_ee_read,
-	.write = nicintel_ee_write_82580,
-	.erase = nicintel_ee_erase_82580,
+	.probe		= nicintel_ee_probe_82580,
+	.read		= nicintel_ee_read,
+	.write		= nicintel_ee_write_82580,
+	.erase		= nicintel_ee_erase_82580,
 };
 
 static const struct opaque_master opaque_master_nicintel_ee_i210 = {
-	.probe = nicintel_ee_probe_i210,
-	.read = nicintel_ee_read,
-	.write = nicintel_ee_write_i210,
-	.erase = nicintel_ee_erase_i210,
+	.probe		= nicintel_ee_probe_i210,
+	.read		= nicintel_ee_read,
+	.write		= nicintel_ee_write_i210,
+	.erase		= nicintel_ee_erase_i210,
 };
 
 static int nicintel_ee_shutdown_i210(void *arg)
diff --git a/nicintel_spi.c b/nicintel_spi.c
index 3af375d..d487161 100644
--- a/nicintel_spi.c
+++ b/nicintel_spi.c
@@ -191,15 +191,15 @@
 }
 
 static const struct bitbang_spi_master bitbang_spi_master_nicintel = {
-	.set_cs = nicintel_bitbang_set_cs,
-	.set_sck = nicintel_bitbang_set_sck,
-	.set_mosi = nicintel_bitbang_set_mosi,
-	.set_sck_set_mosi = nicintel_bitbang_set_sck_set_mosi,
-	.set_sck_get_miso = nicintel_bitbang_set_sck_get_miso,
-	.get_miso = nicintel_bitbang_get_miso,
-	.request_bus = nicintel_request_spibus,
-	.release_bus = nicintel_release_spibus,
-	.half_period = 1,
+	.set_cs			= nicintel_bitbang_set_cs,
+	.set_sck		= nicintel_bitbang_set_sck,
+	.set_mosi		= nicintel_bitbang_set_mosi,
+	.set_sck_set_mosi	= nicintel_bitbang_set_sck_set_mosi,
+	.set_sck_get_miso	= nicintel_bitbang_set_sck_get_miso,
+	.get_miso		= nicintel_bitbang_get_miso,
+	.request_bus		= nicintel_request_spibus,
+	.release_bus		= nicintel_release_spibus,
+	.half_period		= 1,
 };
 
 static int nicintel_spi_shutdown(void *data)
diff --git a/nicnatsemi.c b/nicnatsemi.c
index c134edb..71aed2d 100644
--- a/nicnatsemi.c
+++ b/nicnatsemi.c
@@ -39,14 +39,14 @@
 static uint8_t nicnatsemi_chip_readb(const struct flashctx *flash,
 				     const chipaddr addr);
 static const struct par_master par_master_nicnatsemi = {
-		.chip_readb		= nicnatsemi_chip_readb,
-		.chip_readw		= fallback_chip_readw,
-		.chip_readl		= fallback_chip_readl,
-		.chip_readn		= fallback_chip_readn,
-		.chip_writeb		= nicnatsemi_chip_writeb,
-		.chip_writew		= fallback_chip_writew,
-		.chip_writel		= fallback_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= nicnatsemi_chip_readb,
+	.chip_readw	= fallback_chip_readw,
+	.chip_readl	= fallback_chip_readl,
+	.chip_readn	= fallback_chip_readn,
+	.chip_writeb	= nicnatsemi_chip_writeb,
+	.chip_writew	= fallback_chip_writew,
+	.chip_writel	= fallback_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 static int nicnatsemi_init(void)
diff --git a/nicrealtek.c b/nicrealtek.c
index 858108e..b01df72 100644
--- a/nicrealtek.c
+++ b/nicrealtek.c
@@ -38,14 +38,14 @@
 static void nicrealtek_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr);
 static uint8_t nicrealtek_chip_readb(const struct flashctx *flash, const chipaddr addr);
 static const struct par_master par_master_nicrealtek = {
-		.chip_readb		= nicrealtek_chip_readb,
-		.chip_readw		= fallback_chip_readw,
-		.chip_readl		= fallback_chip_readl,
-		.chip_readn		= fallback_chip_readn,
-		.chip_writeb		= nicrealtek_chip_writeb,
-		.chip_writew		= fallback_chip_writew,
-		.chip_writel		= fallback_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= nicrealtek_chip_readb,
+	.chip_readw	= fallback_chip_readw,
+	.chip_readl	= fallback_chip_readl,
+	.chip_readn	= fallback_chip_readn,
+	.chip_writeb	= nicrealtek_chip_writeb,
+	.chip_writew	= fallback_chip_writew,
+	.chip_writel	= fallback_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 static int nicrealtek_shutdown(void *data)
diff --git a/ogp_spi.c b/ogp_spi.c
index ba32f27..d9e47fa 100644
--- a/ogp_spi.c
+++ b/ogp_spi.c
@@ -83,13 +83,13 @@
 }
 
 static const struct bitbang_spi_master bitbang_spi_master_ogp = {
-	.set_cs = ogp_bitbang_set_cs,
-	.set_sck = ogp_bitbang_set_sck,
-	.set_mosi = ogp_bitbang_set_mosi,
-	.get_miso = ogp_bitbang_get_miso,
-	.request_bus = ogp_request_spibus,
-	.release_bus = ogp_release_spibus,
-	.half_period = 0,
+	.set_cs		= ogp_bitbang_set_cs,
+	.set_sck	= ogp_bitbang_set_sck,
+	.set_mosi	= ogp_bitbang_set_mosi,
+	.get_miso	= ogp_bitbang_get_miso,
+	.request_bus	= ogp_request_spibus,
+	.release_bus	= ogp_release_spibus,
+	.half_period	= 0,
 };
 
 static int ogp_spi_init(void)
diff --git a/pony_spi.c b/pony_spi.c
index d0fcb81..fef8495 100644
--- a/pony_spi.c
+++ b/pony_spi.c
@@ -91,11 +91,11 @@
 }
 
 static const struct bitbang_spi_master bitbang_spi_master_pony = {
-	.set_cs = pony_bitbang_set_cs,
-	.set_sck = pony_bitbang_set_sck,
-	.set_mosi = pony_bitbang_set_mosi,
-	.get_miso = pony_bitbang_get_miso,
-	.half_period = 0,
+	.set_cs		= pony_bitbang_set_cs,
+	.set_sck	= pony_bitbang_set_sck,
+	.set_mosi	= pony_bitbang_set_mosi,
+	.get_miso	= pony_bitbang_get_miso,
+	.half_period	= 0,
 };
 
 static int pony_spi_shutdown(void *data)
diff --git a/rayer_spi.c b/rayer_spi.c
index 4705097..5d224cd 100644
--- a/rayer_spi.c
+++ b/rayer_spi.c
@@ -157,11 +157,11 @@
 }
 
 static const struct bitbang_spi_master bitbang_spi_master_rayer = {
-	.set_cs = rayer_bitbang_set_cs,
-	.set_sck = rayer_bitbang_set_sck,
-	.set_mosi = rayer_bitbang_set_mosi,
-	.get_miso = rayer_bitbang_get_miso,
-	.half_period = 0,
+	.set_cs		= rayer_bitbang_set_cs,
+	.set_sck	= rayer_bitbang_set_sck,
+	.set_mosi	= rayer_bitbang_set_mosi,
+	.get_miso	= rayer_bitbang_get_miso,
+	.half_period	= 0,
 };
 
 static int rayer_spi_init(void)
diff --git a/satamv.c b/satamv.c
index 0b667f8..319ccce 100644
--- a/satamv.c
+++ b/satamv.c
@@ -43,14 +43,14 @@
 static uint8_t satamv_chip_readb(const struct flashctx *flash,
 				 const chipaddr addr);
 static const struct par_master par_master_satamv = {
-		.chip_readb		= satamv_chip_readb,
-		.chip_readw		= fallback_chip_readw,
-		.chip_readl		= fallback_chip_readl,
-		.chip_readn		= fallback_chip_readn,
-		.chip_writeb		= satamv_chip_writeb,
-		.chip_writew		= fallback_chip_writew,
-		.chip_writel		= fallback_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= satamv_chip_readb,
+	.chip_readw	= fallback_chip_readw,
+	.chip_readl	= fallback_chip_readl,
+	.chip_readn	= fallback_chip_readn,
+	.chip_writeb	= satamv_chip_writeb,
+	.chip_writew	= fallback_chip_writew,
+	.chip_writel	= fallback_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 /*
diff --git a/satasii.c b/satasii.c
index 0f782f9..d396a5d 100644
--- a/satasii.c
+++ b/satasii.c
@@ -40,14 +40,14 @@
 static void satasii_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr);
 static uint8_t satasii_chip_readb(const struct flashctx *flash, const chipaddr addr);
 static const struct par_master par_master_satasii = {
-		.chip_readb		= satasii_chip_readb,
-		.chip_readw		= fallback_chip_readw,
-		.chip_readl		= fallback_chip_readl,
-		.chip_readn		= fallback_chip_readn,
-		.chip_writeb		= satasii_chip_writeb,
-		.chip_writew		= fallback_chip_writew,
-		.chip_writel		= fallback_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= satasii_chip_readb,
+	.chip_readw	= fallback_chip_readw,
+	.chip_readl	= fallback_chip_readl,
+	.chip_readn	= fallback_chip_readn,
+	.chip_writeb	= satasii_chip_writeb,
+	.chip_writew	= fallback_chip_writew,
+	.chip_writel	= fallback_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 static uint32_t satasii_wait_done(void)
diff --git a/sb600spi.c b/sb600spi.c
index 21f22f6..b1d9c77 100644
--- a/sb600spi.c
+++ b/sb600spi.c
@@ -62,23 +62,23 @@
 				  const unsigned char *writearr, unsigned char *readarr);
 
 static struct spi_master spi_master_sb600 = {
-	.max_data_read = FIFO_SIZE_OLD,
-	.max_data_write = FIFO_SIZE_OLD - 3,
-	.command = sb600_spi_send_command,
-	.multicommand = default_spi_send_multicommand,
-	.read = default_spi_read,
-	.write_256 = default_spi_write_256,
-	.write_aai = default_spi_write_aai,
+	.max_data_read	= FIFO_SIZE_OLD,
+	.max_data_write	= FIFO_SIZE_OLD - 3,
+	.command	= sb600_spi_send_command,
+	.multicommand	= default_spi_send_multicommand,
+	.read		= default_spi_read,
+	.write_256	= default_spi_write_256,
+	.write_aai	= default_spi_write_aai,
 };
 
 static struct spi_master spi_master_yangtze = {
-	.max_data_read = FIFO_SIZE_YANGTZE - 3, /* Apparently the big SPI 100 buffer is not a ring buffer. */
-	.max_data_write = FIFO_SIZE_YANGTZE - 3,
-	.command = spi100_spi_send_command,
-	.multicommand = default_spi_send_multicommand,
-	.read = default_spi_read,
-	.write_256 = default_spi_write_256,
-	.write_aai = default_spi_write_aai,
+	.max_data_read	= FIFO_SIZE_YANGTZE - 3, /* Apparently the big SPI 100 buffer is not a ring buffer. */
+	.max_data_write	= FIFO_SIZE_YANGTZE - 3,
+	.command	= spi100_spi_send_command,
+	.multicommand	= default_spi_send_multicommand,
+	.read		= default_spi_read,
+	.write_256	= default_spi_write_256,
+	.write_aai	= default_spi_write_aai,
 };
 
 static int find_smbus_dev_rev(uint16_t vendor, uint16_t device)
diff --git a/serprog.c b/serprog.c
index 24a51ac..03c5eec 100644
--- a/serprog.c
+++ b/serprog.c
@@ -343,14 +343,14 @@
 static void serprog_chip_readn(const struct flashctx *flash, uint8_t *buf,
 			       const chipaddr addr, size_t len);
 static const struct par_master par_master_serprog = {
-		.chip_readb		= serprog_chip_readb,
-		.chip_readw		= fallback_chip_readw,
-		.chip_readl		= fallback_chip_readl,
-		.chip_readn		= serprog_chip_readn,
-		.chip_writeb		= serprog_chip_writeb,
-		.chip_writew		= fallback_chip_writew,
-		.chip_writel		= fallback_chip_writel,
-		.chip_writen		= fallback_chip_writen,
+	.chip_readb	= serprog_chip_readb,
+	.chip_readw	= fallback_chip_readw,
+	.chip_readl	= fallback_chip_readl,
+	.chip_readn	= serprog_chip_readn,
+	.chip_writeb	= serprog_chip_writeb,
+	.chip_writew	= fallback_chip_writew,
+	.chip_writel	= fallback_chip_writel,
+	.chip_writen	= fallback_chip_writen,
 };
 
 static enum chipbustype serprog_buses_supported = BUS_NONE;
diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c
index 82a7985..da70868 100644
--- a/stlinkv3_spi.c
+++ b/stlinkv3_spi.c
@@ -435,13 +435,13 @@
 }
 
 static const struct spi_master spi_programmer_stlinkv3 = {
-	.max_data_read = UINT16_MAX,
-	.max_data_write = UINT16_MAX,
-	.command = stlinkv3_spi_transmit,
-	.multicommand = default_spi_send_multicommand,
-	.read = default_spi_read,
-	.write_256 = default_spi_write_256,
-	.write_aai = default_spi_write_aai,
+	.max_data_read	= UINT16_MAX,
+	.max_data_write	= UINT16_MAX,
+	.command	= stlinkv3_spi_transmit,
+	.multicommand	= default_spi_send_multicommand,
+	.read		= default_spi_read,
+	.write_256	= default_spi_write_256,
+	.write_aai	= default_spi_write_aai,
 };
 
 static int stlinkv3_spi_init(void)
diff --git a/wbsio_spi.c b/wbsio_spi.c
index 1674825..9145814 100644
--- a/wbsio_spi.c
+++ b/wbsio_spi.c
@@ -65,13 +65,13 @@
 			  unsigned int start, unsigned int len);
 
 static const struct spi_master spi_master_wbsio = {
-	.max_data_read = MAX_DATA_UNSPECIFIED,
-	.max_data_write = MAX_DATA_UNSPECIFIED,
-	.command = wbsio_spi_send_command,
-	.multicommand = default_spi_send_multicommand,
-	.read = wbsio_spi_read,
-	.write_256 = spi_chip_write_1,
-	.write_aai = spi_chip_write_1,
+	.max_data_read	= MAX_DATA_UNSPECIFIED,
+	.max_data_write	= MAX_DATA_UNSPECIFIED,
+	.command	= wbsio_spi_send_command,
+	.multicommand	= default_spi_send_multicommand,
+	.read		= wbsio_spi_read,
+	.write_256	= spi_chip_write_1,
+	.write_aai	= spi_chip_write_1,
 };
 
 int wbsio_check_for_spi(void)