@@ -183,7 +183,7 @@ static int wilc_wlan_get_firmware(struct net_device *dev)
183
183
{
184
184
struct wilc_vif * vif = netdev_priv (dev );
185
185
struct wilc * wilc = vif -> wilc ;
186
- int chip_id , ret = 0 ;
186
+ int chip_id ;
187
187
const struct firmware * wilc_firmware ;
188
188
char * firmware ;
189
189
@@ -198,14 +198,11 @@ static int wilc_wlan_get_firmware(struct net_device *dev)
198
198
199
199
if (request_firmware (& wilc_firmware , firmware , wilc -> dev ) != 0 ) {
200
200
netdev_err (dev , "%s - firmware not available\n" , firmware );
201
- ret = -1 ;
202
- goto fail ;
201
+ return - EINVAL ;
203
202
}
204
203
wilc -> firmware = wilc_firmware ;
205
204
206
- fail :
207
-
208
- return ret ;
205
+ return 0 ;
209
206
}
210
207
211
208
static int wilc_start_firmware (struct net_device * dev )
@@ -215,7 +212,7 @@ static int wilc_start_firmware(struct net_device *dev)
215
212
int ret = 0 ;
216
213
217
214
ret = wilc_wlan_start (wilc );
218
- if (ret < 0 )
215
+ if (ret )
219
216
return ret ;
220
217
221
218
if (!wait_for_completion_timeout (& wilc -> sync_event ,
@@ -238,7 +235,7 @@ static int wilc1000_firmware_download(struct net_device *dev)
238
235
239
236
ret = wilc_wlan_firmware_download (wilc , wilc -> firmware -> data ,
240
237
wilc -> firmware -> size );
241
- if (ret < 0 )
238
+ if (ret )
242
239
return ret ;
243
240
244
241
release_firmware (wilc -> firmware );
@@ -417,7 +414,7 @@ static int wilc_init_fw_config(struct net_device *dev, struct wilc_vif *vif)
417
414
return 0 ;
418
415
419
416
fail :
420
- return -1 ;
417
+ return - EINVAL ;
421
418
}
422
419
423
420
static void wlan_deinitialize_threads (struct net_device * dev )
@@ -497,14 +494,12 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif)
497
494
wl -> close = 0 ;
498
495
499
496
ret = wilc_wlan_init (dev );
500
- if (ret < 0 )
501
- return - EIO ;
497
+ if (ret )
498
+ return ret ;
502
499
503
500
ret = wlan_initialize_threads (dev );
504
- if (ret < 0 ) {
505
- ret = - EIO ;
501
+ if (ret )
506
502
goto fail_wilc_wlan ;
507
- }
508
503
509
504
if (wl -> gpio_irq && init_irq (dev )) {
510
505
ret = - EIO ;
@@ -518,22 +513,17 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif)
518
513
goto fail_irq_init ;
519
514
}
520
515
521
- if ( wilc_wlan_get_firmware (dev )) {
522
- ret = - EIO ;
516
+ ret = wilc_wlan_get_firmware (dev );
517
+ if ( ret )
523
518
goto fail_irq_enable ;
524
- }
525
519
526
520
ret = wilc1000_firmware_download (dev );
527
- if (ret < 0 ) {
528
- ret = - EIO ;
521
+ if (ret )
529
522
goto fail_irq_enable ;
530
- }
531
523
532
524
ret = wilc_start_firmware (dev );
533
- if (ret < 0 ) {
534
- ret = - EIO ;
525
+ if (ret )
535
526
goto fail_irq_enable ;
536
- }
537
527
538
528
if (wilc_wlan_cfg_get (vif , 1 , WID_FIRMWARE_VERSION , 1 , 0 )) {
539
529
int size ;
@@ -545,11 +535,10 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif)
545
535
firmware_ver [size ] = '\0' ;
546
536
netdev_dbg (dev , "Firmware Ver = %s\n" , firmware_ver );
547
537
}
548
- ret = wilc_init_fw_config (dev , vif );
549
538
550
- if (ret < 0 ) {
539
+ ret = wilc_init_fw_config (dev , vif );
540
+ if (ret ) {
551
541
netdev_err (dev , "Failed to configure firmware\n" );
552
- ret = - EIO ;
553
542
goto fail_fw_start ;
554
543
}
555
544
wl -> initialized = true;
@@ -600,11 +589,11 @@ static int wilc_mac_open(struct net_device *ndev)
600
589
netdev_dbg (ndev , "MAC OPEN[%p]\n" , ndev );
601
590
602
591
ret = wilc_init_host_int (ndev );
603
- if (ret < 0 )
592
+ if (ret )
604
593
return ret ;
605
594
606
595
ret = wilc_wlan_initialize (ndev , vif );
607
- if (ret < 0 ) {
596
+ if (ret ) {
608
597
wilc_deinit_host_int (ndev );
609
598
return ret ;
610
599
}
0 commit comments