--- old/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c	sam. juil. 16 15:15:45 2016
+++ new/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_api.c	sam. juil. 16 15:15:45 2016
@@ -288,18 +288,18 @@
 	24,	/* Number of mailboxes */
 
 	/* Mailbox in register offsets 0 - 23 */
-	0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,
-	0xe0, 0xe2, 0xe4, 0xe6, 0xe8, 0xea, 0xec, 0xee,
-	0xf0, 0xf2, 0xf4, 0xf6, 0xf8, 0xfa, 0xfc, 0xfe,
-	/* 2200 does not have mailbox 24-31 - n/a */
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	{   0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,
+	    0xe0, 0xe2, 0xe4, 0xe6, 0xe8, 0xea, 0xec, 0xee,
+	    0xf0, 0xf2, 0xf4, 0xf6, 0xf8, 0xfa, 0xfc, 0xfe,
+	    /* 2200 does not have mailbox 24-31 - n/a */
+	    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
 
 	/* Mailbox out register offsets 0 - 23 */
-	0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,
-	0xe0, 0xe2, 0xe4, 0xe6, 0xe8, 0xea, 0xec, 0xee,
-	0xf0, 0xf2, 0xf4, 0xf6, 0xf8, 0xfa, 0xfc, 0xfe,
-	/* 2200 does not have mailbox 24-31 - n/a */
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	{   0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,
+	    0xe0, 0xe2, 0xe4, 0xe6, 0xe8, 0xea, 0xec, 0xee,
+	    0xf0, 0xf2, 0xf4, 0xf6, 0xf8, 0xfa, 0xfc, 0xfe,
+	    /* 2200 does not have mailbox 24-31 - n/a */
+	    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
 
 	0x96,	/* fpm_diag_config */
 	0xa4,	/* pcr */
@@ -335,16 +335,16 @@
 	32,	/* Number of mailboxes */
 
 	/* Mailbox in register offsets 0 - 31 */
-	0x40, 0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e,
-	0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e,
-	0x60, 0x62, 0x64, 0x66, 0x68, 0x6a, 0x6c, 0x6e,
-	0x70, 0x72, 0x74, 0x76, 0x78, 0x7a, 0x7c, 0x7e,
+	{   0x40, 0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e,
+	    0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e,
+	    0x60, 0x62, 0x64, 0x66, 0x68, 0x6a, 0x6c, 0x6e,
+	    0x70, 0x72, 0x74, 0x76, 0x78, 0x7a, 0x7c, 0x7e },
 
 	/* Mailbox out register offsets 0 - 31 */
-	0x40, 0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e,
-	0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e,
-	0x60, 0x62, 0x64, 0x66, 0x68, 0x6a, 0x6c, 0x6e,
-	0x70, 0x72, 0x74, 0x76, 0x78, 0x7a, 0x7c, 0x7e,
+	{   0x40, 0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e,
+	    0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e,
+	    0x60, 0x62, 0x64, 0x66, 0x68, 0x6a, 0x6c, 0x6e,
+	    0x70, 0x72, 0x74, 0x76, 0x78, 0x7a, 0x7c, 0x7e },
 
 	0x96,	/* fpm_diag_config */
 	0xa4,	/* pcr */
@@ -380,16 +380,16 @@
 	32,	/* Number of mailboxes */
 
 	/* Mailbox in register offsets 0 - 31 */
-	0x80, 0x82, 0x84, 0x86, 0x88, 0x8a, 0x8c, 0x8e,
-	0x90, 0x92, 0x94, 0x96, 0x98, 0x9a, 0x9c, 0x9e,
-	0xa0, 0xa2, 0xa4, 0xa6, 0xa8, 0xaa, 0xac, 0xae,
-	0xb0, 0xb2, 0xb4, 0xb6, 0xb8, 0xba, 0xbc, 0xbe,
+	{   0x80, 0x82, 0x84, 0x86, 0x88, 0x8a, 0x8c, 0x8e,
+	    0x90, 0x92, 0x94, 0x96, 0x98, 0x9a, 0x9c, 0x9e,
+	    0xa0, 0xa2, 0xa4, 0xa6, 0xa8, 0xaa, 0xac, 0xae,
+	    0xb0, 0xb2, 0xb4, 0xb6, 0xb8, 0xba, 0xbc, 0xbe },
 
 	/* Mailbox out register offsets 0 - 31 */
-	0x80, 0x82, 0x84, 0x86, 0x88, 0x8a, 0x8c, 0x8e,
-	0x90, 0x92, 0x94, 0x96, 0x98, 0x9a, 0x9c, 0x9e,
-	0xa0, 0xa2, 0xa4, 0xa6, 0xa8, 0xaa, 0xac, 0xae,
-	0xb0, 0xb2, 0xb4, 0xb6, 0xb8, 0xba, 0xbc, 0xbe,
+	{   0x80, 0x82, 0x84, 0x86, 0x88, 0x8a, 0x8c, 0x8e,
+	    0x90, 0x92, 0x94, 0x96, 0x98, 0x9a, 0x9c, 0x9e,
+	    0xa0, 0xa2, 0xa4, 0xa6, 0xa8, 0xaa, 0xac, 0xae,
+	    0xb0, 0xb2, 0xb4, 0xb6, 0xb8, 0xba, 0xbc, 0xbe },
 
 	0xff,	/* fpm_diag_config  - n/a */
 	0xff,	/* pcr - n/a */
@@ -425,16 +425,16 @@
 	32,	/* Number of mailboxes */
 
 	/* Mailbox in register offsets 0 - 31 */
-	0x300, 0x302, 0x304, 0x306, 0x308, 0x30a, 0x30c, 0x30e,
-	0x310, 0x312, 0x314, 0x316, 0x318, 0x31a, 0x31c, 0x31e,
-	0x320, 0x322, 0x324, 0x326, 0x328, 0x32a, 0x32c, 0x32e,
-	0x330, 0x332, 0x334, 0x336, 0x338, 0x33a, 0x33c, 0x33e,
+	{   0x300, 0x302, 0x304, 0x306, 0x308, 0x30a, 0x30c, 0x30e,
+	    0x310, 0x312, 0x314, 0x316, 0x318, 0x31a, 0x31c, 0x31e,
+	    0x320, 0x322, 0x324, 0x326, 0x328, 0x32a, 0x32c, 0x32e,
+	    0x330, 0x332, 0x334, 0x336, 0x338, 0x33a, 0x33c, 0x33e },
 
 	/* Mailbox out register offsets 0 - 31 */
-	0x400, 0x402, 0x404, 0x406, 0x408, 0x40a, 0x40c, 0x40e,
-	0x410, 0x412, 0x414, 0x416, 0x418, 0x41a, 0x41c, 0x41e,
-	0x420, 0x422, 0x424, 0x426, 0x428, 0x42a, 0x42c, 0x42e,
-	0x430, 0x432, 0x434, 0x436, 0x438, 0x43a, 0x43c, 0x43e,
+	{   0x400, 0x402, 0x404, 0x406, 0x408, 0x40a, 0x40c, 0x40e,
+	    0x410, 0x412, 0x414, 0x416, 0x418, 0x41a, 0x41c, 0x41e,
+	    0x420, 0x422, 0x424, 0x426, 0x428, 0x42a, 0x42c, 0x42e,
+	    0x430, 0x432, 0x434, 0x436, 0x438, 0x43a, 0x43c, 0x43e },
 
 	0xff,	/* fpm_diag_config  - n/a */
 	0xff,	/* pcr - n/a */
@@ -569,8 +569,7 @@
 
 static struct modlinkage modlinkage = {
 	MODREV_1,
-	&modldrv,
-	NULL
+	{ &modldrv, NULL }
 };
 
 /* ************************************************************************ */
@@ -16363,7 +16362,7 @@
 	int32_t		actual = 0;
 	int32_t		msitype = DDI_INTR_TYPE_MSI;
 	int32_t		ret;
-	ql_ifunc_t	itrfun[10] = {0};
+	ql_ifunc_t	itrfun[10] = {{NULL}};
 
 	QL_PRINT_3(CE_CONT, "(%d): started\n", ha->instance);
 
@@ -16485,7 +16484,7 @@
 	int32_t		msitype = DDI_INTR_TYPE_MSIX;
 	int32_t		ret;
 	uint32_t	i;
-	ql_ifunc_t	itrfun[QL_MSIX_MAXAIF] = {0};
+	ql_ifunc_t	itrfun[QL_MSIX_MAXAIF] = {{NULL}};
 
 	QL_PRINT_3(CE_CONT, "(%d): started\n", ha->instance);
 
