diff options
Diffstat (limited to 'drivers/net/spider_net.c')
-rw-r--r-- | drivers/net/spider_net.c | 12 |
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) | |||
1697 | */ | 1697 | */ |
1698 | static int | 1698 | static int |
1699 | spider_net_download_firmware(struct spider_net_card *card, | 1699 | spider_net_download_firmware(struct spider_net_card *card, |
1700 | u8 *firmware_ptr) | 1700 | const void *firmware_ptr) |
1701 | { | 1701 | { |
1702 | int sequencer, i; | 1702 | int sequencer, i; |
1703 | u32 *fw_ptr = (u32 *)firmware_ptr; | 1703 | const u32 *fw_ptr = firmware_ptr; |
1704 | 1704 | ||
1705 | /* stop sequencers */ | 1705 | /* stop sequencers */ |
1706 | spider_net_write_reg(card, SPIDER_NET_GSINIT, | 1706 | spider_net_write_reg(card, SPIDER_NET_GSINIT, |
@@ -1757,7 +1757,7 @@ spider_net_init_firmware(struct spider_net_card *card) | |||
1757 | { | 1757 | { |
1758 | struct firmware *firmware = NULL; | 1758 | struct firmware *firmware = NULL; |
1759 | struct device_node *dn; | 1759 | struct device_node *dn; |
1760 | u8 *fw_prop = NULL; | 1760 | const u8 *fw_prop = NULL; |
1761 | int err = -ENOENT; | 1761 | int err = -ENOENT; |
1762 | int fw_size; | 1762 | int fw_size; |
1763 | 1763 | ||
@@ -1783,7 +1783,7 @@ try_host_fw: | |||
1783 | if (!dn) | 1783 | if (!dn) |
1784 | goto out_err; | 1784 | goto out_err; |
1785 | 1785 | ||
1786 | fw_prop = (u8 *)get_property(dn, "firmware", &fw_size); | 1786 | fw_prop = get_property(dn, "firmware", &fw_size); |
1787 | if (!fw_prop) | 1787 | if (!fw_prop) |
1788 | goto out_err; | 1788 | goto out_err; |
1789 | 1789 | ||
@@ -1986,7 +1986,7 @@ spider_net_setup_netdev(struct spider_net_card *card) | |||
1986 | struct net_device *netdev = card->netdev; | 1986 | struct net_device *netdev = card->netdev; |
1987 | struct device_node *dn; | 1987 | struct device_node *dn; |
1988 | struct sockaddr addr; | 1988 | struct sockaddr addr; |
1989 | u8 *mac; | 1989 | const u8 *mac; |
1990 | 1990 | ||
1991 | SET_MODULE_OWNER(netdev); | 1991 | SET_MODULE_OWNER(netdev); |
1992 | SET_NETDEV_DEV(netdev, &card->pdev->dev); | 1992 | SET_NETDEV_DEV(netdev, &card->pdev->dev); |
@@ -2019,7 +2019,7 @@ spider_net_setup_netdev(struct spider_net_card *card) | |||
2019 | if (!dn) | 2019 | if (!dn) |
2020 | return -EIO; | 2020 | return -EIO; |
2021 | 2021 | ||
2022 | mac = (u8 *)get_property(dn, "local-mac-address", NULL); | 2022 | mac = get_property(dn, "local-mac-address", NULL); |
2023 | if (!mac) | 2023 | if (!mac) |
2024 | return -EIO; | 2024 | return -EIO; |
2025 | memcpy(addr.sa_data, mac, ETH_ALEN); | 2025 | memcpy(addr.sa_data, mac, ETH_ALEN); |