From: Mateusz Kulikowski Date: Sun, 19 Jul 2015 17:27:24 +0000 (+0200) Subject: staging: rtl8192e: Rename rtl8192_enable_rx X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=78c352b2b22348f28edda51fae2d61928fae4450;p=deliverable%2Flinux.git staging: rtl8192e: Rename rtl8192_enable_rx Use naming schema found in other rtlwifi devices. Rename rtl8192_enable_rx to rtl92e_enable_rx. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index b2bf58e73434..7aa566705308 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -2255,7 +2255,7 @@ void rtl92e_clear_irq(struct net_device *dev) } -void rtl8192_enable_rx(struct net_device *dev) +void rtl92e_enable_rx(struct net_device *dev) { struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h index 3d717a40bf8b..94755c425357 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h @@ -33,7 +33,7 @@ bool rtl8192_HalTxCheckStuck(struct net_device *dev); bool rtl8192_HalRxCheckStuck(struct net_device *dev); void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta, u32 *p_intb); -void rtl8192_enable_rx(struct net_device *dev); +void rtl92e_enable_rx(struct net_device *dev); void rtl8192_enable_tx(struct net_device *dev); void rtl92e_enable_irq(struct net_device *dev); void rtl92e_disable_irq(struct net_device *dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index dd7b0dc258b1..1352c98ed454 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -57,7 +57,7 @@ static struct rtl819x_ops rtl819xp_ops = { .irq_enable = rtl92e_enable_irq, .irq_disable = rtl92e_disable_irq, .irq_clear = rtl92e_clear_irq, - .rx_enable = rtl8192_enable_rx, + .rx_enable = rtl92e_enable_rx, .tx_enable = rtl8192_enable_tx, .interrupt_recognized = rtl8192_interrupt_recognized, .TxCheckStuckHandler = rtl8192_HalTxCheckStuck,