summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/aquantia
diff options
context:
space:
mode:
authorPavel Belous <pavel.belous@aquantia.com>2017-02-20 20:36:40 +0100
committerDavid S. Miller <davem@davemloft.net>2017-02-20 23:11:09 +0100
commit15e32a5e1e016f40712c3c843c84078385c49db2 (patch)
treec85ff862bb949e688d24ffca79a8b2a05d359e1c /drivers/net/ethernet/aquantia
parentnet: ethernet: aquantia: Removed extra assignment for skb->dev. (diff)
downloadlinux-15e32a5e1e016f40712c3c843c84078385c49db2.tar.xz
linux-15e32a5e1e016f40712c3c843c84078385c49db2.zip
net: ethernet: aquantia: Removed busy_count field.
busy_count field and is_busy flag is not needed at all. Signed-off-by: Pavel Belous <pavel.belous@aquantia.com> Reviewed-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aquantia')
-rw-r--r--drivers/net/ethernet/aquantia/atlantic/aq_nic.c11
-rw-r--r--drivers/net/ethernet/aquantia/atlantic/aq_utils.h1
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index aa22a7ce710b..a153750523bd 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -122,14 +122,11 @@ static void aq_nic_service_timer_cb(unsigned long param)
struct aq_nic_s *self = (struct aq_nic_s *)param;
struct net_device *ndev = aq_nic_get_ndev(self);
int err = 0;
- bool is_busy = false;
unsigned int i = 0U;
struct aq_hw_link_status_s link_status;
struct aq_ring_stats_rx_s stats_rx;
struct aq_ring_stats_tx_s stats_tx;
- atomic_inc(&self->header.busy_count);
- is_busy = true;
if (aq_utils_obj_test(&self->header.flags, AQ_NIC_FLAGS_IS_NOT_READY))
goto err_exit;
@@ -170,8 +167,6 @@ static void aq_nic_service_timer_cb(unsigned long param)
ndev->stats.tx_errors = stats_tx.errors;
err_exit:
- if (is_busy)
- atomic_dec(&self->header.busy_count);
mod_timer(&self->service_timer,
jiffies + AQ_CFG_SERVICE_TIMER_INTERVAL);
}
@@ -574,16 +569,12 @@ __acquires(&ring->lock)
unsigned int trys = AQ_CFG_LOCK_TRYS;
int err = 0;
bool is_nic_in_bad_state;
- bool is_busy = false;
struct aq_ring_buff_s buffers[AQ_CFG_SKB_FRAGS_MAX];
frags = skb_shinfo(skb)->nr_frags + 1;
ring = self->aq_ring_tx[AQ_NIC_TCVEC2RING(self, tc, vec)];
- atomic_inc(&self->header.busy_count);
- is_busy = true;
-
if (frags > AQ_CFG_SKB_FRAGS_MAX) {
dev_kfree_skb_any(skb);
goto err_exit;
@@ -629,8 +620,6 @@ __acquires(&ring->lock)
}
err_exit:
- if (is_busy)
- atomic_dec(&self->header.busy_count);
return err;
}
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_utils.h b/drivers/net/ethernet/aquantia/atlantic/aq_utils.h
index 4446bd90fd86..f6012b34abe6 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_utils.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_utils.h
@@ -19,7 +19,6 @@
struct aq_obj_s {
spinlock_t lock; /* spinlock for nic/rings processing */
atomic_t flags;
- atomic_t busy_count;
};
static inline void aq_utils_obj_set(atomic_t *flags, u32 mask)