Merge branch 'kill_tasklet_hi_enable'

Quentin Lambert says:

====================
Remove redundant function

tasklet_hi_enable and tasklet_enable are redundant. Since
tasklet_hi_enable is used only 6 times in 1 file, the first
patch changes calls to the function with calls to tasklet_enable.

The second patch removes tasklet_hi_enable definition.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 6 insertions, 12 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:
         jme_free_rx_resources(jme);
 out_enable_tasklet:
         tasklet_enable(&jme->txclean_task);
-        tasklet_hi_enable(&jme->rxclean_task);
-        tasklet_hi_enable(&jme->rxempty_task);
+        tasklet_enable(&jme->rxclean_task);
+        tasklet_enable(&jme->rxempty_task);
 out:
         atomic_inc(&jme->link_changing);
 }
@@ -2408,8 +2408,8 @@ static inline void jme_resume_rx(struct jme_adapter *jme)
         if (test_bit(JME_FLAG_POLL, &jme->flags)) {
                 JME_NAPI_ENABLE(jme);
         } else {
-                tasklet_hi_enable(&jme->rxclean_task);
-                tasklet_hi_enable(&jme->rxempty_task);
+                tasklet_enable(&jme->rxclean_task);
+                tasklet_enable(&jme->rxempty_task);
         }
         dpi->cur                = PCC_P1;
         dpi->attempt            = PCC_P1;
@@ -3290,8 +3290,8 @@ jme_suspend(struct device *dev)
         }
 
         tasklet_enable(&jme->txclean_task);
-        tasklet_hi_enable(&jme->rxclean_task);
-        tasklet_hi_enable(&jme->rxempty_task);
+        tasklet_enable(&jme->rxclean_task);
+        tasklet_enable(&jme->rxempty_task);
 
         jme_powersave_phy(jme);
 
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 69517a24bc50..d9b05b5bf8c7 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -556,12 +556,6 @@ static inline void tasklet_enable(struct tasklet_struct *t)
         atomic_dec(&t->count);
 }
 
-static inline void tasklet_hi_enable(struct tasklet_struct *t)
-{
-        smp_mb__before_atomic();
-        atomic_dec(&t->count);
-}
-
 extern void tasklet_kill(struct tasklet_struct *t);
 extern void tasklet_kill_immediate(struct tasklet_struct *t, unsigned int cpu);
 extern void tasklet_init(struct tasklet_struct *t,