From: Chaehyun Lim Date: Mon, 14 Sep 2015 03:24:01 +0000 (+0900) Subject: staging: wilc1000: rename WILC_WFI_CfgSetChannel X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=80785a9a82fc6a5979129a1aedb1260034c6927b;p=deliverable%2Flinux.git staging: wilc1000: rename WILC_WFI_CfgSetChannel This patch replaces WILC_WFI_CfgSetChannel with set_channel to avoid CamelCase. Signed-off-by: Chaehyun Lim Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 26412a597489..c2060ff91872 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -677,7 +677,7 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, /** - * @brief WILC_WFI_CfgSetChannel + * @brief set_channel * @details Set channel for a given wireless interface. Some devices * may support multi-channel operation (by channel hopping) so cfg80211 * doesn't verify much. Note, however, that the passed netdev may be @@ -689,8 +689,8 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, * @date 01 MAR 2012 * @version 1.0 */ -static int WILC_WFI_CfgSetChannel(struct wiphy *wiphy, - struct cfg80211_chan_def *chandef) +static int set_channel(struct wiphy *wiphy, + struct cfg80211_chan_def *chandef) { u32 channelnum = 0; @@ -3230,7 +3230,7 @@ static int WILC_WFI_start_ap(struct wiphy *wiphy, struct net_device *dev, PRINT_D(HOSTAPD_DBG, "Interval = %d\n DTIM period = %d\n Head length = %zu Tail length = %zu\n", settings->beacon_interval, settings->dtim_period, beacon->head_len, beacon->tail_len); - s32Error = WILC_WFI_CfgSetChannel(wiphy, &settings->chandef); + s32Error = set_channel(wiphy, &settings->chandef); if (s32Error != WILC_SUCCESS) PRINT_ER("Error in setting channel\n"); @@ -3558,7 +3558,7 @@ int WILC_WFI_del_virt_intf(struct wiphy *wiphy, struct wireless_dev *wdev) #endif /*WILC_AP_EXTERNAL_MLME*/ static struct cfg80211_ops WILC_WFI_cfg80211_ops = { - .set_monitor_channel = WILC_WFI_CfgSetChannel, + .set_monitor_channel = set_channel, .scan = WILC_WFI_CfgScan, .connect = WILC_WFI_CfgConnect, .disconnect = WILC_WFI_disconnect,