From: Malcolm Priestley Date: Wed, 25 Jun 2014 20:20:03 +0000 (+0100) Subject: staging: vt6656: Remove vnt_set_channel from device_init_registers X-Git-Tag: v5.15~17495^2~1450 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97b9cd8daab286a4b282080c2f6359bd2e4113c8;p=platform%2Fkernel%2Flinux-starfive.git staging: vt6656: Remove vnt_set_channel from device_init_registers Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index feecd51..56bdf9d 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -242,7 +242,6 @@ device_set_options(struct vnt_private *pDevice) { */ static int device_init_registers(struct vnt_private *pDevice) { - struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; struct vnt_cmd_card_init *init_cmd = &pDevice->init_command; struct vnt_rsp_card_init *init_rsp = &pDevice->init_response; u8 abyBroadcastAddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; @@ -468,12 +467,6 @@ static int device_init_registers(struct vnt_private *pDevice) } } - pMgmt->eScanType = WMAC_SCAN_PASSIVE; - pMgmt->uCurrChannel = pDevice->uChannel; - pMgmt->uIBSSChannel = pDevice->uChannel; - - vnt_set_channel(pDevice, pMgmt->uCurrChannel); - /* get permanent network address */ memcpy(pDevice->abyPermanentNetAddr, init_rsp->net_addr, 6); memcpy(pDevice->abyCurrentNetAddr,