Merge branch 'topic/hda-gateway' into topic/hda

[karo-tx-linux.git] / drivers / net / s2io.c

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 512861923c6bcfd82a76c7d6ec27e9d61619af0b..f5c57c059bca15c7d9e35f0b26c39fb0551bc718 100644 (file)
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2866,7 +2866,6 @@ static int s2io_poll_inta(struct napi_struct *napi, int budget)
 {
        struct s2io_nic *nic = container_of(napi, struct s2io_nic, napi);
        struct ring_info *ring;
-       struct net_device *dev = nic->dev;
        struct config_param *config;
        struct mac_info *mac_control;
        int pkts_processed = 0;
@@ -4330,7 +4329,6 @@ static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id)
        struct ring_info *ring = (struct ring_info *)dev_id;
        struct s2io_nic *sp = ring->nic;
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
-       struct net_device *dev = sp->dev;
 
        if (unlikely(!is_s2io_card_up(sp)))
                return IRQ_HANDLED;
@@ -5113,7 +5111,7 @@ static void s2io_set_multicast(struct net_device *dev)
 /* read from CAM unicast & multicast addresses and store it in
  * def_mac_addr structure
  */
-void do_s2io_store_unicast_mc(struct s2io_nic *sp)
+static void do_s2io_store_unicast_mc(struct s2io_nic *sp)
 {
        int offset;
        u64 mac_addr = 0x0;