Merge branch 'merge'

[linux-drm-fsl-dcu.git] / drivers / net / spider_net.c

diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 647f62e9707dd3ac701bdf3f7c2c31e99765452f..d64e718afbd2bbe167bac2e122a736b4419a932b 100644 (file)
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1611,13 +1611,12 @@ spider_net_open(struct net_device *netdev)
        int result;
 
        result = -ENOMEM;
-       if (spider_net_init_chain(card, &card->tx_chain,
-                       card->descr,
-                       PCI_DMA_TODEVICE, tx_descriptors))
+       if (spider_net_init_chain(card, &card->tx_chain, card->descr,
+                       PCI_DMA_TODEVICE, card->tx_desc))
                goto alloc_tx_failed;
        if (spider_net_init_chain(card, &card->rx_chain,
-                       card->descr + tx_descriptors,
-                       PCI_DMA_FROMDEVICE, rx_descriptors))
+                       card->descr + card->rx_desc,
+                       PCI_DMA_FROMDEVICE, card->rx_desc))
                goto alloc_rx_failed;
 
        /* allocate rx skbs */
@@ -1698,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,
@@ -1758,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;
 
@@ -1784,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;
 
@@ -1987,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);
@@ -2005,6 +2004,9 @@ spider_net_setup_netdev(struct spider_net_card *card)
 
        card->options.rx_csum = SPIDER_NET_RX_CSUM_DEFAULT;
 
+       card->tx_desc = tx_descriptors;
+       card->rx_desc = rx_descriptors;
+
        spider_net_setup_netdev_ops(netdev);
 
        netdev->features = NETIF_F_HW_CSUM | NETIF_F_LLTX;
@@ -2017,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);