2 files changed, 18 insertions, 20 deletions

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c
index edc5fb6412d9..2c3e6baf2524 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c
@@ -317,8 +317,8 @@ static int rv_tf_set_num_active_display(struct pp_hwmgr *hwmgr, void *input,
 }
 
 static const struct phm_master_table_item rv_set_power_state_list[] = {
-        { NULL, rv_tf_set_clock_limit },
-        { NULL, rv_tf_set_num_active_display },
+        { .tableFunction = rv_tf_set_clock_limit },
+        { .tableFunction = rv_tf_set_num_active_display },
         { }
 };
 
@@ -391,7 +391,7 @@ static int rv_tf_disable_gfx_off(struct pp_hwmgr *hwmgr,
 }
 
 static const struct phm_master_table_item rv_disable_dpm_list[] = {
-        {NULL, rv_tf_disable_gfx_off},
+        { .tableFunction = rv_tf_disable_gfx_off },
         { },
 };
 
@@ -416,7 +416,7 @@ static int rv_tf_enable_gfx_off(struct pp_hwmgr *hwmgr,
 }
 
 static const struct phm_master_table_item rv_enable_dpm_list[] = {
-        {NULL, rv_tf_enable_gfx_off},
+        { .tableFunction = rv_tf_enable_gfx_off },
         { },
 };
 
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index 2f0bd6955f33..deea41e96f01 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -483,11 +483,10 @@ static void z8530_status(struct z8530_channel *chan)
         write_zsctrl(chan, RES_H_IUS);
 }
 
-struct z8530_irqhandler z8530_sync =
-{
-        z8530_rx,
-        z8530_tx,
-        z8530_status
+struct z8530_irqhandler z8530_sync = {
+        .rx = z8530_rx,
+        .tx = z8530_tx,
+        .status = z8530_status,
 };
 
 EXPORT_SYMBOL(z8530_sync);
@@ -605,15 +604,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
 }
 
 static struct z8530_irqhandler z8530_dma_sync = {
-        z8530_dma_rx,
-        z8530_dma_tx,
-        z8530_dma_status
+        .rx = z8530_dma_rx,
+        .tx = z8530_dma_tx,
+        .status = z8530_dma_status,
 };
 
 static struct z8530_irqhandler z8530_txdma_sync = {
-        z8530_rx,
-        z8530_dma_tx,
-        z8530_dma_status
+        .rx = z8530_rx,
+        .tx = z8530_dma_tx,
+        .status = z8530_dma_status,
 };
 
 /**
@@ -678,11 +677,10 @@ static void z8530_status_clear(struct z8530_channel *chan)
         write_zsctrl(chan, RES_H_IUS);
 }
 
-struct z8530_irqhandler z8530_nop=
-{
-        z8530_rx_clear,
-        z8530_tx_clear,
-        z8530_status_clear
+struct z8530_irqhandler z8530_nop = {
+        .rx = z8530_rx_clear,
+        .tx = z8530_tx_clear,
+        .status = z8530_status_clear,
 };