From: Leo Kim <leo.kim@xxxxxxxxx> This patch renames pfScanResult of struct scan_attr to result to avoid CamelCase naming convention. Signed-off-by: Leo Kim <leo.kim@xxxxxxxxx> Signed-off-by: Tony Cho <tony.cho@xxxxxxxxx> --- drivers/staging/wilc1000/host_interface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index a390dee..c5cf7d4 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -102,7 +102,7 @@ struct scan_attr { u8 ch_list_len; u8 *ies; size_t ies_len; - wilc_scan_result pfScanResult; + wilc_scan_result result; void *pvUserArg; struct hidden_network strHiddenNetwork; }; @@ -840,7 +840,7 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv, PRINT_D(HOSTINF_DBG, "Setting SCAN params\n"); PRINT_D(HOSTINF_DBG, "Scanning: In [%d] state\n", hif_drv->enuHostIFstate); - hif_drv->strWILC_UsrScanReq.pfUserScanResult = pstrHostIFscanAttr->pfScanResult; + hif_drv->strWILC_UsrScanReq.pfUserScanResult = pstrHostIFscanAttr->result; hif_drv->strWILC_UsrScanReq.u32UserScanPvoid = pstrHostIFscanAttr->pvUserArg; if ((hif_drv->enuHostIFstate >= HOST_IF_SCANNING) && (hif_drv->enuHostIFstate < HOST_IF_CONNECTED)) { @@ -4059,7 +4059,7 @@ s32 host_int_scan(struct host_if_drv *hif_drv, u8 u8ScanSource, msg.drv = hif_drv; msg.body.scan_info.src = u8ScanSource; msg.body.scan_info.type = u8ScanType; - msg.body.scan_info.pfScanResult = ScanResult; + msg.body.scan_info.result = ScanResult; msg.body.scan_info.pvUserArg = pvUserArg; msg.body.scan_info.ch_list_len = u8ChnlListLen; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html