drivers/net/wan/z85230.c: Use designated initializers

In preparation for the randstruct gcc plugin performing randomization of
structures that are entirely function pointers, use designated initializers
so the compiler doesn't get angry.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index 2f0bd6955f3398d65a4a71177fa8bbd56b446825..deea41e96f0183e7d6d1b10ee029e1aa0f50c523 100644 (file)
--- 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,
 };