From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:24:13 +0000 (+0200) Subject: staging: rtl8192e: Rename firmware_check_ready X-Git-Tag: firefly_0821_release~176^2~802^2~1520 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3270b5074fd23101d6983cd52dd661e5e916e470;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Rename firmware_check_ready Use naming schema found in other rtlwifi devices. Rename firmware_check_ready to _rtl92e_fw_check_ready. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c index 41fc0e244f83..78fb9e905c9a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c @@ -177,8 +177,8 @@ CPUCheckFirmwareReady_Fail: } -static bool firmware_check_ready(struct net_device *dev, - u8 load_fw_status) +static bool _rtl92e_fw_check_ready(struct net_device *dev, + u8 load_fw_status) { struct r8192_priv *priv = rtllib_priv(dev); struct rt_firmware *pfirmware = priv->pFirmware; @@ -304,7 +304,7 @@ bool rtl92e_init_fw(struct net_device *dev) if (!rt_status) goto download_firmware_fail; - if (!firmware_check_ready(dev, i)) + if (!_rtl92e_fw_check_ready(dev, i)) goto download_firmware_fail; }