net: fjes: constify and use eth_hw_addr_set()

Get it ready for constant netdev->dev_addr.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/fjes/fjes_hw.c b/drivers/net/fjes/fjes_hw.c
index 065bb0a40b1d1e3343bfaeadc3eb85b8a129f551..704e949484d0c1684247302fb29f45b7ffa3b3e1 100644 (file)
--- a/drivers/net/fjes/fjes_hw.c
+++ b/drivers/net/fjes/fjes_hw.c
@@ -137,7 +137,8 @@ static void fjes_hw_free_epbuf(struct epbuf_handler *epbh)
        epbh->ring = NULL;
 }
 
-void fjes_hw_setup_epbuf(struct epbuf_handler *epbh, u8 *mac_addr, u32 mtu)
+void fjes_hw_setup_epbuf(struct epbuf_handler *epbh, const u8 *mac_addr,
+                        u32 mtu)
 {
        union ep_buffer_info *info = epbh->info;
        u16 vlan_id[EP_BUFFER_SUPPORT_VLAN_MAX];

diff --git a/drivers/net/fjes/fjes_hw.h b/drivers/net/fjes/fjes_hw.h
index b4608ea2a2d57c8cf4c2d08272f95d77033e2c21..997c7b37a40237ab0135a072b3856a72053cab2b 100644 (file)
--- a/drivers/net/fjes/fjes_hw.h
+++ b/drivers/net/fjes/fjes_hw.h
@@ -330,7 +330,7 @@ int fjes_hw_register_buff_addr(struct fjes_hw *, int,
 int fjes_hw_unregister_buff_addr(struct fjes_hw *, int);
 void fjes_hw_init_command_registers(struct fjes_hw *,
                                    struct fjes_device_command_param *);
-void fjes_hw_setup_epbuf(struct epbuf_handler *, u8 *, u32);
+void fjes_hw_setup_epbuf(struct epbuf_handler *, const u8 *, u32);
 int fjes_hw_raise_interrupt(struct fjes_hw *, int, enum REG_ICTL_MASK);
 void fjes_hw_set_irqmask(struct fjes_hw *, enum REG_ICTL_MASK, bool);
 u32 fjes_hw_capture_interrupt_status(struct fjes_hw *);

diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c
index 185c8a3986816ad02eae84ad8e05b126786d2477..b06c17ac8d4eedeb8a2903c9e5c9fa73f191b90b 100644 (file)
--- a/drivers/net/fjes/fjes_main.c
+++ b/drivers/net/fjes/fjes_main.c
@@ -1203,6 +1203,7 @@ static int fjes_probe(struct platform_device *plat_dev)
        struct net_device *netdev;
        struct resource *res;
        struct fjes_hw *hw;
+       u8 addr[ETH_ALEN];
        int err;
 
        err = -ENOMEM;
@@ -1266,12 +1267,13 @@ static int fjes_probe(struct platform_device *plat_dev)
                goto err_free_control_wq;
 
        /* setup MAC address (02:00:00:00:00:[epid])*/
-       netdev->dev_addr[0] = 2;
-       netdev->dev_addr[1] = 0;
-       netdev->dev_addr[2] = 0;
-       netdev->dev_addr[3] = 0;
-       netdev->dev_addr[4] = 0;
-       netdev->dev_addr[5] = hw->my_epid; /* EPID */
+       addr[0] = 2;
+       addr[1] = 0;
+       addr[2] = 0;
+       addr[3] = 0;
+       addr[4] = 0;
+       addr[5] = hw->my_epid; /* EPID */
+       eth_hw_addr_set(netdev, addr);
 
        err = register_netdev(netdev);
        if (err)