}
 
 static struct access_method SA5_access = {
-       SA5_submit_command,
-       SA5_intr_mask,
-       SA5_fifo_full,
-       SA5_intr_pending,
-       SA5_completed,
+       .submit_command = SA5_submit_command,
+       .set_intr_mask = SA5_intr_mask,
+       .fifo_full = SA5_fifo_full,
+       .intr_pending = SA5_intr_pending,
+       .command_completed = SA5_completed,
 };
 
 static struct access_method SA5B_access = {
-        SA5_submit_command,
-        SA5B_intr_mask,
-        SA5_fifo_full,
-        SA5B_intr_pending,
-        SA5_completed,
+       .submit_command = SA5_submit_command,
+       .set_intr_mask = SA5B_intr_mask,
+       .fifo_full = SA5_fifo_full,
+       .intr_pending = SA5B_intr_pending,
+       .command_completed = SA5_completed,
 };
 
 static struct access_method SA5_performant_access = {
-       SA5_submit_command,
-       SA5_performant_intr_mask,
-       SA5_fifo_full,
-       SA5_performant_intr_pending,
-       SA5_performant_completed,
+       .submit_command = SA5_submit_command,
+       .set_intr_mask = SA5_performant_intr_mask,
+       .fifo_full = SA5_fifo_full,
+       .intr_pending = SA5_performant_intr_pending,
+       .command_completed = SA5_performant_completed,
 };
 
 struct board_type {