From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:12:52 +0000 (+0200) Subject: staging: rtl8192e: Rename rtl8192_restart X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=78e67df3f3d58ae5fced1cee24024d2c337e111b;p=deliverable%2Flinux.git staging: rtl8192e: Rename rtl8192_restart Use naming schema found in other rtlwifi devices. Rename rtl8192_restart to _rtl92e_restart. 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 4d6cf521477c..d625d8933427 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -102,7 +102,7 @@ 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); static int _rtl92e_down(struct net_device *dev, bool shutdownrf); -static void rtl8192_restart(void *data); +static void _rtl92e_restart(void *data); /**************************************************************************** -----------------------------IO STUFF------------------------- @@ -1007,7 +1007,7 @@ static void _rtl92e_init_priv_task(struct net_device *dev) struct r8192_priv *priv = rtllib_priv(dev); priv->priv_wq = create_workqueue(DRV_NAME); - INIT_WORK_RSL(&priv->reset_wq, (void *)rtl8192_restart, dev); + INIT_WORK_RSL(&priv->reset_wq, (void *)_rtl92e_restart, dev); INIT_WORK_RSL(&priv->rtllib->ips_leave_wq, (void *)rtl92e_ips_leave_wq, dev); INIT_DELAYED_WORK_RSL(&priv->watch_dog_wq, @@ -2250,7 +2250,7 @@ void rtl92e_commit(struct net_device *dev) _rtl8192_up(dev, false); } -static void rtl8192_restart(void *data) +static void _rtl92e_restart(void *data) { struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv, reset_wq);