Print this page
7127  remove -Wno-missing-braces from Makefile.uts

@@ -261,11 +261,11 @@
 
 /* Note: these may go away in the future... */
 static uint32_t sd_xbuf_active_limit    = 512;
 static uint32_t sd_xbuf_reserve_limit   = 16;
 
-static struct sd_resv_reclaim_request   sd_tr = { NULL, NULL, NULL, 0, 0, 0 };
+static struct sd_resv_reclaim_request   sd_tr = { NULL, NULL, NULL, {0} };
 
 /*
  * Timer value used to reset the throttle after it has been reduced
  * (typically in response to TRAN_BUSY or STATUS_QFULL)
  */

@@ -832,11 +832,11 @@
  */
 #define VPD_HEAD_OFFSET         3       /* size of head for vpd page */
 #define VPD_PAGE_LENGTH         3       /* offset for pge length data */
 #define VPD_MODE_PAGE           1       /* offset into vpd pg for "page code" */
 
-static kmutex_t sd_sense_mutex = {0};
+static kmutex_t sd_sense_mutex = {{NULL}};
 
 /*
  * Macros for updates of the driver state
  */
 #define New_state(un, s)        \

@@ -1769,21 +1769,21 @@
         SD_MODULE_NAME,         /* Module name. */
         &sd_ops                 /* driver ops */
 };
 
 static struct modlinkage modlinkage = {
-        MODREV_1, &modldrv, NULL
+        MODREV_1, { &modldrv, NULL }
 };
 
 #else /* XPV_HVM_DRIVER */
 static struct modlmisc modlmisc = {
         &mod_miscops,           /* Type of module. This one is a misc */
         "HVM " SD_MODULE_NAME,          /* Module name. */
 };
 
 static struct modlinkage modlinkage = {
-        MODREV_1, &modlmisc, NULL
+        MODREV_1, { &modlmisc, NULL }
 };
 
 #endif /* XPV_HVM_DRIVER */
 
 static cmlb_tg_ops_t sd_tgops = {

@@ -1791,23 +1791,23 @@
         sd_tg_rdwr,
         sd_tg_getinfo
 };
 
 static struct scsi_asq_key_strings sd_additional_codes[] = {
-        0x81, 0, "Logical Unit is Reserved",
-        0x85, 0, "Audio Address Not Valid",
-        0xb6, 0, "Media Load Mechanism Failed",
-        0xB9, 0, "Audio Play Operation Aborted",
-        0xbf, 0, "Buffer Overflow for Read All Subcodes Command",
-        0x53, 2, "Medium removal prevented",
-        0x6f, 0, "Authentication failed during key exchange",
-        0x6f, 1, "Key not present",
-        0x6f, 2, "Key not established",
-        0x6f, 3, "Read without proper authentication",
-        0x6f, 4, "Mismatched region to this logical unit",
-        0x6f, 5, "Region reset count error",
-        0xffff, 0x0, NULL
+        { 0x81, 0, "Logical Unit is Reserved" },
+        { 0x85, 0, "Audio Address Not Valid" },
+        { 0xb6, 0, "Media Load Mechanism Failed" },
+        { 0xB9, 0, "Audio Play Operation Aborted" },
+        { 0xbf, 0, "Buffer Overflow for Read All Subcodes Command" },
+        { 0x53, 2, "Medium removal prevented" },
+        { 0x6f, 0, "Authentication failed during key exchange" },
+        { 0x6f, 1, "Key not present" },
+        { 0x6f, 2, "Key not established" },
+        { 0x6f, 3, "Read without proper authentication" },
+        { 0x6f, 4, "Mismatched region to this logical unit" },
+        { 0x6f, 5, "Region reset count error" },
+        { 0xffff, 0x0, NULL }
 };
 
 
 /*
  * Struct for passing printing information for sense data messages