bna: remove unused cbfn parameter

[cascardo/linux.git] / drivers / net / ethernet / brocade / bna / bnad.c

diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index 37072a8..0f833e4 100644 (file)
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -57,7 +57,8 @@ static u32 bnad_rxqs_per_cq = 2;
 static u32 bna_id;
 static struct mutex bnad_list_mutex;
 static LIST_HEAD(bnad_list);
-static const u8 bnad_bcast_addr[] =  {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+static const u8 bnad_bcast_addr[] __aligned(2) =
+       { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
 /*
  * Local MACROS
@@ -875,9 +876,9 @@ bnad_set_netdev_perm_addr(struct bnad *bnad)
 {
        struct net_device *netdev = bnad->netdev;
 
-       memcpy(netdev->perm_addr, &bnad->perm_addr, netdev->addr_len);
+       ether_addr_copy(netdev->perm_addr, bnad->perm_addr);
        if (is_zero_ether_addr(netdev->dev_addr))
-               memcpy(netdev->dev_addr, &bnad->perm_addr, netdev->addr_len);
+               ether_addr_copy(netdev->dev_addr, bnad->perm_addr);
 }
 
 /* Control Path Handlers */
@@ -1094,8 +1095,8 @@ bnad_cb_tx_resume(struct bnad *bnad, struct bna_tx *tx)
         * get a 0 MAC address. We try to get the MAC address
         * again here.
         */
-       if (is_zero_ether_addr(&bnad->perm_addr.mac[0])) {
-               bna_enet_perm_mac_get(&bnad->bna.enet, &bnad->perm_addr);
+       if (is_zero_ether_addr(bnad->perm_addr)) {
+               bna_enet_perm_mac_get(&bnad->bna.enet, bnad->perm_addr);
                bnad_set_netdev_perm_addr(bnad);
        }
 }
@@ -1862,8 +1863,7 @@ bnad_netdev_mc_list_get(struct net_device *netdev, u8 *mc_list)
        struct netdev_hw_addr *mc_addr;
 
        netdev_for_each_mc_addr(mc_addr, netdev) {
-               memcpy(&mc_list[i * ETH_ALEN], &mc_addr->addr[0],
-                                                       ETH_ALEN);
+               ether_addr_copy(&mc_list[i * ETH_ALEN], &mc_addr->addr[0]);
                i++;
        }
 }
@@ -2349,7 +2349,7 @@ bnad_mac_addr_set_locked(struct bnad *bnad, u8 *mac_addr)
        if (!bnad->rx_info[0].rx)
                return 0;
 
-       ret = bna_rx_ucast_set(bnad->rx_info[0].rx, mac_addr, NULL);
+       ret = bna_rx_ucast_set(bnad->rx_info[0].rx, mac_addr);
        if (ret != BNA_CB_SUCCESS)
                return -EADDRNOTAVAIL;
 
@@ -2754,7 +2754,7 @@ bnad_open(struct net_device *netdev)
        spin_lock_irqsave(&bnad->bna_lock, flags);
        bna_enet_mtu_set(&bnad->bna.enet,
                         BNAD_FRAME_SIZE(bnad->netdev->mtu), NULL);
-       bna_enet_pause_config(&bnad->bna.enet, &pause_config, NULL);
+       bna_enet_pause_config(&bnad->bna.enet, &pause_config);
        bna_enet_enable(&bnad->bna.enet);
        spin_unlock_irqrestore(&bnad->bna_lock, flags);
 
@@ -3128,7 +3128,7 @@ bnad_set_rx_ucast_fltr(struct bnad *bnad)
        int entry;
 
        if (netdev_uc_empty(bnad->netdev)) {
-               bna_rx_ucast_listset(bnad->rx_info[0].rx, 0, NULL, NULL);
+               bna_rx_ucast_listset(bnad->rx_info[0].rx, 0, NULL);
                return;
        }
 
@@ -3141,13 +3141,11 @@ bnad_set_rx_ucast_fltr(struct bnad *bnad)
 
        entry = 0;
        netdev_for_each_uc_addr(ha, netdev) {
-               memcpy(&mac_list[entry * ETH_ALEN],
-                      &ha->addr[0], ETH_ALEN);
+               ether_addr_copy(&mac_list[entry * ETH_ALEN], &ha->addr[0]);
                entry++;
        }
 
-       ret = bna_rx_ucast_listset(bnad->rx_info[0].rx, entry,
-                       mac_list, NULL);
+       ret = bna_rx_ucast_listset(bnad->rx_info[0].rx, entry, mac_list);
        kfree(mac_list);
 
        if (ret != BNA_CB_SUCCESS)
@@ -3158,7 +3156,7 @@ bnad_set_rx_ucast_fltr(struct bnad *bnad)
        /* ucast packets not in UCAM are routed to default function */
 mode_default:
        bnad->cfg_flags |= BNAD_CF_DEFAULT;
-       bna_rx_ucast_listset(bnad->rx_info[0].rx, 0, NULL, NULL);
+       bna_rx_ucast_listset(bnad->rx_info[0].rx, 0, NULL);
 }
 
 static void
@@ -3183,12 +3181,11 @@ bnad_set_rx_mcast_fltr(struct bnad *bnad)
        if (mac_list == NULL)
                goto mode_allmulti;
 
-       memcpy(&mac_list[0], &bnad_bcast_addr[0], ETH_ALEN);
+       ether_addr_copy(&mac_list[0], &bnad_bcast_addr[0]);
 
        /* copy rest of the MCAST addresses */
        bnad_netdev_mc_list_get(netdev, mac_list);
-       ret = bna_rx_mcast_listset(bnad->rx_info[0].rx, mc_count + 1,
-                       mac_list, NULL);
+       ret = bna_rx_mcast_listset(bnad->rx_info[0].rx, mc_count + 1, mac_list);
        kfree(mac_list);
 
        if (ret != BNA_CB_SUCCESS)
@@ -3198,7 +3195,7 @@ bnad_set_rx_mcast_fltr(struct bnad *bnad)
 
 mode_allmulti:
        bnad->cfg_flags |= BNAD_CF_ALLMULTI;
-       bna_rx_mcast_delall(bnad->rx_info[0].rx, NULL);
+       bna_rx_mcast_delall(bnad->rx_info[0].rx);
 }
 
 void
@@ -3237,7 +3234,7 @@ bnad_set_rx_mode(struct net_device *netdev)
 
        mode_mask = BNA_RXMODE_PROMISC | BNA_RXMODE_DEFAULT |
                        BNA_RXMODE_ALLMULTI;
-       bna_rx_mode_set(bnad->rx_info[0].rx, new_mode, mode_mask, NULL);
+       bna_rx_mode_set(bnad->rx_info[0].rx, new_mode, mode_mask);
 
        spin_unlock_irqrestore(&bnad->bna_lock, flags);
 }
@@ -3248,19 +3245,18 @@ bnad_set_rx_mode(struct net_device *netdev)
  * in a non-blocking context.
  */
 static int
-bnad_set_mac_address(struct net_device *netdev, void *mac_addr)
+bnad_set_mac_address(struct net_device *netdev, void *addr)
 {
        int err;
        struct bnad *bnad = netdev_priv(netdev);
-       struct sockaddr *sa = (struct sockaddr *)mac_addr;
+       struct sockaddr *sa = (struct sockaddr *)addr;
        unsigned long flags;
 
        spin_lock_irqsave(&bnad->bna_lock, flags);
 
        err = bnad_mac_addr_set_locked(bnad, sa->sa_data);
-
        if (!err)
-               memcpy(netdev->dev_addr, sa->sa_data, netdev->addr_len);
+               ether_addr_copy(netdev->dev_addr, sa->sa_data);
 
        spin_unlock_irqrestore(&bnad->bna_lock, flags);
 
@@ -3701,10 +3697,6 @@ bnad_pci_probe(struct pci_dev *pdev,
        setup_timer(&bnad->bna.ioceth.ioc.sem_timer, bnad_iocpf_sem_timeout,
                                ((unsigned long)bnad));
 
-       /* Now start the timer before calling IOC */
-       mod_timer(&bnad->bna.ioceth.ioc.iocpf_timer,
-                 jiffies + msecs_to_jiffies(BNA_IOC_TIMER_FREQ));
-
        /*
         * Start the chip
         * If the call back comes with error, we bail out.
@@ -3746,7 +3738,7 @@ bnad_pci_probe(struct pci_dev *pdev,
 
        /* Get the burnt-in mac */
        spin_lock_irqsave(&bnad->bna_lock, flags);
-       bna_enet_perm_mac_get(&bna->enet, &bnad->perm_addr);
+       bna_enet_perm_mac_get(&bna->enet, bnad->perm_addr);
        bnad_set_netdev_perm_addr(bnad);
        spin_unlock_irqrestore(&bnad->bna_lock, flags);