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

USB: sisusb_con.c: move assignment out of if () block

We should not be doing assignments within an if () block
so fix up the code to not do this.

change was created using Coccinelle.

CC: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Felipe Balbi <balbi@ti.com>

Greg Kroah-Hartman b87f5671 187859f9

+36 -18
+36 -18
drivers/usb/misc/sisusbvga/sisusb_con.c
··· 169 169 if (in_atomic()) 170 170 return NULL; 171 171 172 - if (!(sisusb = sisusb_get_sisusb(console))) 172 + sisusb = sisusb_get_sisusb(console); 173 + if (!sisusb) 173 174 return NULL; 174 175 175 176 mutex_lock(&sisusb->lock); ··· 215 214 * are set up/restored. 216 215 */ 217 216 218 - if (!(sisusb = sisusb_get_sisusb(c->vc_num))) 217 + sisusb = sisusb_get_sisusb(c->vc_num); 218 + if (!sisusb) 219 219 return; 220 220 221 221 mutex_lock(&sisusb->lock); ··· 279 277 * and others, ie not under our control. 280 278 */ 281 279 282 - if (!(sisusb = sisusb_get_sisusb(c->vc_num))) 280 + sisusb = sisusb_get_sisusb(c->vc_num); 281 + if (!sisusb) 283 282 return; 284 283 285 284 mutex_lock(&sisusb->lock); ··· 372 369 struct sisusb_usb_data *sisusb; 373 370 ssize_t written; 374 371 375 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 372 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 373 + if (!sisusb) 376 374 return; 377 375 378 376 /* sisusb->lock is down */ ··· 399 395 u16 *dest; 400 396 int i; 401 397 402 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 398 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 399 + if (!sisusb) 403 400 return; 404 401 405 402 /* sisusb->lock is down */ ··· 438 433 if (width <= 0 || height <= 0) 439 434 return; 440 435 441 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 436 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 437 + if (!sisusb) 442 438 return; 443 439 444 440 /* sisusb->lock is down */ ··· 492 486 if (width <= 0 || height <= 0) 493 487 return; 494 488 495 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 489 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 490 + if (!sisusb) 496 491 return; 497 492 498 493 /* sisusb->lock is down */ ··· 527 520 * Returnvalue != 0 naturally means the opposite. 528 521 */ 529 522 530 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 523 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 524 + if (!sisusb) 531 525 return 0; 532 526 533 527 /* sisusb->lock is down */ ··· 577 569 * buffer. 578 570 */ 579 571 580 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 572 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 573 + if (!sisusb) 581 574 return; 582 575 583 576 /* sisusb->lock is down */ ··· 611 602 if (!CON_IS_VISIBLE(c)) 612 603 return -EINVAL; 613 604 614 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 605 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 606 + if (!sisusb) 615 607 return -EINVAL; 616 608 617 609 /* sisusb->lock is down */ ··· 647 637 ssize_t written; 648 638 int ret = 0; 649 639 650 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 640 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 641 + if (!sisusb) 651 642 return 0; 652 643 653 644 /* sisusb->lock is down */ ··· 732 721 733 722 /* The return value does not seem to be used */ 734 723 735 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 724 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 725 + if (!sisusb) 736 726 return 0; 737 727 738 728 /* sisusb->lock is down */ ··· 791 779 struct sisusb_usb_data *sisusb; 792 780 int from, to, baseline; 793 781 794 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 782 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 783 + if (!sisusb) 795 784 return; 796 785 797 786 /* sisusb->lock is down */ ··· 919 906 if (!lines) 920 907 return 1; 921 908 922 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 909 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 910 + if (!sisusb) 923 911 return 0; 924 912 925 913 /* sisusb->lock is down */ ··· 1032 1018 * screenbuffer as the origin. 1033 1019 */ 1034 1020 1035 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 1021 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 1022 + if (!sisusb) 1036 1023 return 0; 1037 1024 1038 1025 /* sisusb->lock is down */ ··· 1062 1047 struct sisusb_usb_data *sisusb; 1063 1048 int fh; 1064 1049 1065 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 1050 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 1051 + if (!sisusb) 1066 1052 return -ENODEV; 1067 1053 1068 1054 fh = sisusb->current_font_height; ··· 1302 1286 if (font->width != 8 || (charcount != 256 && charcount != 512)) 1303 1287 return -EINVAL; 1304 1288 1305 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 1289 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 1290 + if (!sisusb) 1306 1291 return -ENODEV; 1307 1292 1308 1293 /* sisusb->lock is down */ ··· 1343 1326 { 1344 1327 struct sisusb_usb_data *sisusb; 1345 1328 1346 - if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num))) 1329 + sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num); 1330 + if (!sisusb) 1347 1331 return -ENODEV; 1348 1332 1349 1333 /* sisusb->lock is down */