Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: rtl8188eu: os_dep: usb_intf.c: Fix to remove null pointer checks that could never happen

Removal of null pointer checks that could never happen

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Rickard Strandqvist and committed by
Greg Kroah-Hartman
89b90c68 d6c455ac

+62 -68
+62 -68
drivers/staging/rtl8188eu/os_dep/usb_intf.c
··· 306 306 goto error_exit; 307 307 } 308 308 309 - if (padapter) { /* system suspend */ 310 - LeaveAllPowerSaveMode(padapter); 309 + /* system suspend */ 310 + LeaveAllPowerSaveMode(padapter); 311 311 312 - DBG_88E("==> rtw_hw_suspend\n"); 313 - _enter_pwrlock(&pwrpriv->lock); 314 - pwrpriv->bips_processing = true; 315 - /* s1. */ 316 - if (pnetdev) { 317 - netif_carrier_off(pnetdev); 318 - rtw_netif_stop_queue(pnetdev); 319 - } 320 - 321 - /* s2. */ 322 - rtw_disassoc_cmd(padapter, 500, false); 323 - 324 - /* s2-2. indicate disconnect to os */ 325 - { 326 - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; 327 - 328 - if (check_fwstate(pmlmepriv, _FW_LINKED)) { 329 - _clr_fwstate_(pmlmepriv, _FW_LINKED); 330 - 331 - rtw_led_control(padapter, LED_CTL_NO_LINK); 332 - 333 - rtw_os_indicate_disconnect(padapter); 334 - 335 - /* donnot enqueue cmd */ 336 - rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 0); 337 - } 338 - } 339 - /* s2-3. */ 340 - rtw_free_assoc_resources(padapter, 1); 341 - 342 - /* s2-4. */ 343 - rtw_free_network_queue(padapter, true); 344 - rtw_ips_dev_unload(padapter); 345 - pwrpriv->rf_pwrstate = rf_off; 346 - pwrpriv->bips_processing = false; 347 - 348 - _exit_pwrlock(&pwrpriv->lock); 349 - } else { 350 - goto error_exit; 312 + DBG_88E("==> rtw_hw_suspend\n"); 313 + _enter_pwrlock(&pwrpriv->lock); 314 + pwrpriv->bips_processing = true; 315 + /* s1. */ 316 + if (pnetdev) { 317 + netif_carrier_off(pnetdev); 318 + rtw_netif_stop_queue(pnetdev); 351 319 } 320 + 321 + /* s2. */ 322 + rtw_disassoc_cmd(padapter, 500, false); 323 + 324 + /* s2-2. indicate disconnect to os */ 325 + { 326 + struct mlme_priv *pmlmepriv = &padapter->mlmepriv; 327 + 328 + if (check_fwstate(pmlmepriv, _FW_LINKED)) { 329 + _clr_fwstate_(pmlmepriv, _FW_LINKED); 330 + 331 + rtw_led_control(padapter, LED_CTL_NO_LINK); 332 + 333 + rtw_os_indicate_disconnect(padapter); 334 + 335 + /* donnot enqueue cmd */ 336 + rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 0); 337 + } 338 + } 339 + /* s2-3. */ 340 + rtw_free_assoc_resources(padapter, 1); 341 + 342 + /* s2-4. */ 343 + rtw_free_network_queue(padapter, true); 344 + rtw_ips_dev_unload(padapter); 345 + pwrpriv->rf_pwrstate = rf_off; 346 + pwrpriv->bips_processing = false; 347 + 348 + _exit_pwrlock(&pwrpriv->lock); 349 + 352 350 return 0; 353 351 354 352 error_exit: ··· 360 362 struct net_device *pnetdev = padapter->pnetdev; 361 363 362 364 363 - if (padapter) { /* system resume */ 364 - DBG_88E("==> rtw_hw_resume\n"); 365 - _enter_pwrlock(&pwrpriv->lock); 366 - pwrpriv->bips_processing = true; 367 - rtw_reset_drv_sw(padapter); 365 + /* system resume */ 366 + DBG_88E("==> rtw_hw_resume\n"); 367 + _enter_pwrlock(&pwrpriv->lock); 368 + pwrpriv->bips_processing = true; 369 + rtw_reset_drv_sw(padapter); 368 370 369 - if (pm_netdev_open(pnetdev, false) != 0) { 370 - _exit_pwrlock(&pwrpriv->lock); 371 - goto error_exit; 372 - } 373 - 374 - netif_device_attach(pnetdev); 375 - netif_carrier_on(pnetdev); 376 - 377 - if (!netif_queue_stopped(pnetdev)) 378 - netif_start_queue(pnetdev); 379 - else 380 - netif_wake_queue(pnetdev); 381 - 382 - pwrpriv->bkeepfwalive = false; 383 - pwrpriv->brfoffbyhw = false; 384 - 385 - pwrpriv->rf_pwrstate = rf_on; 386 - pwrpriv->bips_processing = false; 387 - 371 + if (pm_netdev_open(pnetdev, false) != 0) { 388 372 _exit_pwrlock(&pwrpriv->lock); 389 - } else { 390 373 goto error_exit; 391 374 } 375 + 376 + netif_device_attach(pnetdev); 377 + netif_carrier_on(pnetdev); 378 + 379 + if (!netif_queue_stopped(pnetdev)) 380 + netif_start_queue(pnetdev); 381 + else 382 + netif_wake_queue(pnetdev); 383 + 384 + pwrpriv->bkeepfwalive = false; 385 + pwrpriv->brfoffbyhw = false; 386 + 387 + pwrpriv->rf_pwrstate = rf_on; 388 + pwrpriv->bips_processing = false; 389 + 390 + _exit_pwrlock(&pwrpriv->lock); 392 391 393 392 394 393 return 0; ··· 496 501 497 502 _enter_pwrlock(&pwrpriv->lock); 498 503 rtw_reset_drv_sw(padapter); 499 - if (pwrpriv) 500 - pwrpriv->bkeepfwalive = false; 504 + pwrpriv->bkeepfwalive = false; 501 505 502 506 DBG_88E("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive); 503 507 if (pm_netdev_open(pnetdev, true) != 0)