From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:09:29 +0000 (+0200) Subject: staging: rtl8192e: Rename rtl8192_irq_rx_tasklet X-Git-Tag: firefly_0821_release~176^2~802^2~1703 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2940405b2bc47adcf8d4490f2ab7747d51014b09;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Rename rtl8192_irq_rx_tasklet Use naming schema found in other rtlwifi devices. Rename rtl8192_irq_rx_tasklet to _rtl92e_irq_rx_tasklet. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 4fb280c295d1..7138f3285ce9 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -97,7 +97,7 @@ static void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb); static short rtl8192_tx(struct net_device *dev, struct sk_buff *skb); static short rtl8192_pci_initdescring(struct net_device *dev); static void rtl8192_irq_tx_tasklet(struct r8192_priv *priv); -static void rtl8192_irq_rx_tasklet(struct r8192_priv *priv); +static void _rtl92e_irq_rx_tasklet(struct r8192_priv *priv); static void rtl8192_cancel_deferred_work(struct r8192_priv *priv); static int _rtl8192_up(struct net_device *dev, bool is_silent_reset); static int rtl8192_up(struct net_device *dev); @@ -1024,7 +1024,7 @@ static void _rtl92e_init_priv_task(struct net_device *dev) INIT_DELAYED_WORK_RSL(&priv->rtllib->hw_sleep_wq, (void *) rtl92e_hw_sleep_wq, dev); tasklet_init(&priv->irq_rx_tasklet, - (void(*)(unsigned long))rtl8192_irq_rx_tasklet, + (void(*)(unsigned long))_rtl92e_irq_rx_tasklet, (unsigned long)priv); tasklet_init(&priv->irq_tx_tasklet, (void(*)(unsigned long))rtl8192_irq_tx_tasklet, @@ -2161,7 +2161,7 @@ static void rtl8192_irq_tx_tasklet(struct r8192_priv *priv) rtl8192_tx_resume(priv->rtllib->dev); } -static void rtl8192_irq_rx_tasklet(struct r8192_priv *priv) +static void _rtl92e_irq_rx_tasklet(struct r8192_priv *priv) { rtl8192_rx_normal(priv->rtllib->dev);