aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Lambert <lambert.quentin@gmail.com>2014-12-12 07:35:52 -0500
committerDavid S. Miller <davem@davemloft.net>2014-12-12 15:15:41 -0500
commit06f665296d84c56bf9d6bcd0d6b9fe01a2b66145 (patch)
tree3f1e2673456891e84eb0a8bd7110ed5ed93c69df
parenta169758a271768eeebdbc3260435558534695015 (diff)
jme: replace calls to redundant function
Calls to tasklet_hi_enable are replaced by calls to tasklet_enable since the 2 functions are redundant. Signed-off-by: Quentin Lambert <lambert.quentin@gmail.com> Signed-off-by: Valentin Rothberg <valentinrothberg@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/jme.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c
index 4a1be34d7214..44ce7d88f554 100644
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -1364,8 +1364,8 @@ err_out_free_rx_resources:
1364 jme_free_rx_resources(jme); 1364 jme_free_rx_resources(jme);
1365out_enable_tasklet: 1365out_enable_tasklet:
1366 tasklet_enable(&jme->txclean_task); 1366 tasklet_enable(&jme->txclean_task);
1367 tasklet_hi_enable(&jme->rxclean_task); 1367 tasklet_enable(&jme->rxclean_task);
1368 tasklet_hi_enable(&jme->rxempty_task); 1368 tasklet_enable(&jme->rxempty_task);
1369out: 1369out:
1370 atomic_inc(&jme->link_changing); 1370 atomic_inc(&jme->link_changing);
1371} 1371}
@@ -2408,8 +2408,8 @@ static inline void jme_resume_rx(struct jme_adapter *jme)
2408 if (test_bit(JME_FLAG_POLL, &jme->flags)) { 2408 if (test_bit(JME_FLAG_POLL, &jme->flags)) {
2409 JME_NAPI_ENABLE(jme); 2409 JME_NAPI_ENABLE(jme);
2410 } else { 2410 } else {
2411 tasklet_hi_enable(&jme->rxclean_task); 2411 tasklet_enable(&jme->rxclean_task);
2412 tasklet_hi_enable(&jme->rxempty_task); 2412 tasklet_enable(&jme->rxempty_task);
2413 } 2413 }
2414 dpi->cur = PCC_P1; 2414 dpi->cur = PCC_P1;
2415 dpi->attempt = PCC_P1; 2415 dpi->attempt = PCC_P1;
@@ -3290,8 +3290,8 @@ jme_suspend(struct device *dev)
3290 } 3290 }
3291 3291
3292 tasklet_enable(&jme->txclean_task); 3292 tasklet_enable(&jme->txclean_task);
3293 tasklet_hi_enable(&jme->rxclean_task); 3293 tasklet_enable(&jme->rxclean_task);
3294 tasklet_hi_enable(&jme->rxempty_task); 3294 tasklet_enable(&jme->rxempty_task);
3295 3295
3296 jme_powersave_phy(jme); 3296 jme_powersave_phy(jme);
3297 3297