Merge branch 'mainline' into upstream-linus

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 88907218457a..d64e718afbd2 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1697,10 +1697,10 @@ spider_net_setup_phy(struct spider_net_card *card)
  */
 static int
 spider_net_download_firmware(struct spider_net_card *card,
-                             u8 *firmware_ptr)
+                             const void *firmware_ptr)
 {
         int sequencer, i;
-        u32 *fw_ptr = (u32 *)firmware_ptr;
+        const u32 *fw_ptr = firmware_ptr;
 
         /* stop sequencers */
         spider_net_write_reg(card, SPIDER_NET_GSINIT,
@@ -1757,7 +1757,7 @@ spider_net_init_firmware(struct spider_net_card *card)
 {
         struct firmware *firmware = NULL;
         struct device_node *dn;
-        u8 *fw_prop = NULL;
+        const u8 *fw_prop = NULL;
         int err = -ENOENT;
         int fw_size;
 
@@ -1783,7 +1783,7 @@ try_host_fw:
         if (!dn)
                 goto out_err;
 
-        fw_prop = (u8 *)get_property(dn, "firmware", &fw_size);
+        fw_prop = get_property(dn, "firmware", &fw_size);
         if (!fw_prop)
                 goto out_err;
 
@@ -1986,7 +1986,7 @@ spider_net_setup_netdev(struct spider_net_card *card)
         struct net_device *netdev = card->netdev;
         struct device_node *dn;
         struct sockaddr addr;
-        u8 *mac;
+        const u8 *mac;
 
         SET_MODULE_OWNER(netdev);
         SET_NETDEV_DEV(netdev, &card->pdev->dev);
@@ -2019,7 +2019,7 @@ spider_net_setup_netdev(struct spider_net_card *card)
         if (!dn)
                 return -EIO;
 
-        mac = (u8 *)get_property(dn, "local-mac-address", NULL);
+        mac = get_property(dn, "local-mac-address", NULL);
         if (!mac)
                 return -EIO;
         memcpy(addr.sa_data, mac, ETH_ALEN);