staging:media: Removed assignments from if statements.

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

kernel os linux

The following coccinelle script found the match:

@simple@
expression E1, E2;
statement S1, S2;
@@

+ E1 = E2;
if (
- (E1 = E2)
+ E1
)
S1 else S2

@left@
expression E0, E1, E2;
statement S0, S1;
@@
- if ((E1 = E2) < E0)
+ E1 = E2;
+ if (E1 < E0)
S1

Signed-off-by: Chi Pham <fempsci@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Chi Pham and committed by

Greg Kroah-Hartman 12 years ago 86a7dacc f4d636dd

+124 -63

7 changed files

expand all

drivers

staging

media

sn9c102

sn9c102_core.c

sn9c102_hv7131d.c

sn9c102_hv7131r.c

sn9c102_ov7630.c

sn9c102_ov7660.c

sn9c102_pas106b.c

sn9c102_pas202bcb.c

+50 -26

drivers/staging/media/sn9c102/sn9c102_core.c

··· 158 158 159 159 cam->nbuffers = count; 160 160 while (cam->nbuffers > 0) { 161 - if ((buff = vmalloc_32_user(cam->nbuffers * 162 - PAGE_ALIGN(imagesize)))) 161 + buff = vmalloc_32_user(cam->nbuffers * PAGE_ALIGN(imagesize)); 162 + if (buff) 163 163 break; 164 164 cam->nbuffers--; 165 165 } ··· 1121 1121 return -ENODEV; 1122 1122 } 1123 1123 1124 - if ((val = sn9c102_read_reg(cam, cam->sysfs.reg)) < 0) { 1124 + val = sn9c102_read_reg(cam, cam->sysfs.reg); 1125 + if (val < 0) { 1125 1126 mutex_unlock(&sn9c102_sysfs_lock); 1126 1127 return -EIO; 1127 1128 } ··· 1257 1256 return -ENOSYS; 1258 1257 } 1259 1258 1260 - if ((val = sn9c102_i2c_read(cam, cam->sysfs.i2c_reg)) < 0) { 1259 + val = sn9c102_i2c_read(cam, cam->sysfs.i2c_reg); 1260 + if (val < 0) { 1261 1261 mutex_unlock(&sn9c102_sysfs_lock); 1262 1262 return -EIO; 1263 1263 } ··· 1442 1440 struct device *dev = &(cam->v4ldev->dev); 1443 1441 int err = 0; 1444 1442 1445 - if ((err = device_create_file(dev, &dev_attr_reg))) 1443 + err = device_create_file(dev, &dev_attr_reg); 1444 + if (err) 1446 1445 goto err_out; 1447 - if ((err = device_create_file(dev, &dev_attr_val))) 1446 + err = device_create_file(dev, &dev_attr_val); 1447 + if (err) 1448 1448 goto err_reg; 1449 - if ((err = device_create_file(dev, &dev_attr_frame_header))) 1449 + err = device_create_file(dev, &dev_attr_frame_header); 1450 + if (err) 1450 1451 goto err_val; 1451 1452 1452 1453 if (cam->sensor.sysfs_ops) { 1453 - if ((err = device_create_file(dev, &dev_attr_i2c_reg))) 1454 + err = device_create_file(dev, &dev_attr_i2c_reg); 1455 + if (err) 1454 1456 goto err_frame_header; 1455 - if ((err = device_create_file(dev, &dev_attr_i2c_val))) 1457 + err = device_create_file(dev, &dev_attr_i2c_val); 1458 + if (err) 1456 1459 goto err_i2c_reg; 1457 1460 } 1458 1461 1459 1462 if (cam->bridge == BRIDGE_SN9C101 || cam->bridge == BRIDGE_SN9C102) { 1460 - if ((err = device_create_file(dev, &dev_attr_green))) 1463 + err = device_create_file(dev, &dev_attr_green); 1464 + if (err) 1461 1465 goto err_i2c_val; 1462 1466 } else { 1463 - if ((err = device_create_file(dev, &dev_attr_blue))) 1467 + err = device_create_file(dev, &dev_attr_blue); 1468 + if (err) 1464 1469 goto err_i2c_val; 1465 - if ((err = device_create_file(dev, &dev_attr_red))) 1470 + err = device_create_file(dev, &dev_attr_red); 1471 + if (err) 1466 1472 goto err_blue; 1467 1473 } 1468 1474 ··· 1694 1684 else 1695 1685 DBG(3, "Uncompressed video format is active"); 1696 1686 1697 - if (s->set_crop) 1698 - if ((err = s->set_crop(cam, rect))) { 1687 + if (s->set_crop) { 1688 + err = s->set_crop(cam, rect); 1689 + if (err) { 1699 1690 DBG(3, "set_crop() failed"); 1700 1691 return err; 1701 1692 } 1693 + } 1702 1694 1703 1695 if (s->set_ctrl) { 1704 1696 for (i = 0; i < ARRAY_SIZE(s->qctrl); i++) ··· 1847 1835 cam->state &= ~DEV_MISCONFIGURED; 1848 1836 } 1849 1837 1850 - if ((err = sn9c102_start_transfer(cam))) 1838 + err = sn9c102_start_transfer(cam); 1839 + if (err) 1851 1840 goto out; 1852 1841 1853 1842 filp->private_data = cam; ··· 2321 2308 } 2322 2309 if (i == ARRAY_SIZE(s->qctrl)) 2323 2310 return -EINVAL; 2324 - if ((err = s->set_ctrl(cam, &ctrl))) 2311 + err = s->set_ctrl(cam, &ctrl); 2312 + if (err) 2325 2313 return err; 2326 2314 2327 2315 s->_qctrl[i].default_value = ctrl.value; ··· 2430 2416 } else 2431 2417 scale = 1; 2432 2418 2433 - if (cam->stream == STREAM_ON) 2434 - if ((err = sn9c102_stream_interrupt(cam))) 2419 + if (cam->stream == STREAM_ON) { 2420 + err = sn9c102_stream_interrupt(cam); 2421 + if (err) 2435 2422 return err; 2423 + } 2436 2424 2437 2425 if (copy_to_user(arg, &crop, sizeof(crop))) { 2438 2426 cam->stream = stream; ··· 2688 2672 return -EBUSY; 2689 2673 } 2690 2674 2691 - if (cam->stream == STREAM_ON) 2692 - if ((err = sn9c102_stream_interrupt(cam))) 2675 + if (cam->stream == STREAM_ON) { 2676 + err = sn9c102_stream_interrupt(cam); 2677 + if (err) 2693 2678 return err; 2679 + } 2694 2680 2695 2681 if (copy_to_user(arg, &format, sizeof(format))) { 2696 2682 cam->stream = stream; ··· 2764 2746 if (jc.quality != 0 && jc.quality != 1) 2765 2747 return -EINVAL; 2766 2748 2767 - if (cam->stream == STREAM_ON) 2768 - if ((err = sn9c102_stream_interrupt(cam))) 2749 + if (cam->stream == STREAM_ON) { 2750 + err = sn9c102_stream_interrupt(cam); 2751 + if (err) 2769 2752 return err; 2753 + } 2770 2754 2771 2755 err += sn9c102_set_compression(cam, &jc); 2772 2756 if (err) { /* atomic, no rollback in ioctl() */ ··· 2814 2794 return -EBUSY; 2815 2795 } 2816 2796 2817 - if (cam->stream == STREAM_ON) 2818 - if ((err = sn9c102_stream_interrupt(cam))) 2797 + if (cam->stream == STREAM_ON) { 2798 + err = sn9c102_stream_interrupt(cam); 2799 + if (err) 2819 2800 return err; 2801 + } 2820 2802 2821 2803 sn9c102_empty_framequeues(cam); 2822 2804 ··· 2996 2974 if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io != IO_MMAP) 2997 2975 return -EINVAL; 2998 2976 2999 - if (cam->stream == STREAM_ON) 3000 - if ((err = sn9c102_stream_interrupt(cam))) 2977 + if (cam->stream == STREAM_ON) { 2978 + err = sn9c102_stream_interrupt(cam); 2979 + if (err) 3001 2980 return err; 2981 + } 3002 2982 3003 2983 sn9c102_empty_framequeues(cam); 3004 2984

+10 -5

drivers/staging/media/sn9c102/sn9c102_hv7131d.c

··· 53 53 } 54 54 return 0; 55 55 case V4L2_CID_RED_BALANCE: 56 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x31)) < 0) 56 + ctrl->value = sn9c102_i2c_read(cam, 0x31); 57 + if (ctrl->value < 0) 57 58 return -EIO; 58 59 ctrl->value = 0x3f - (ctrl->value & 0x3f); 59 60 return 0; 60 61 case V4L2_CID_BLUE_BALANCE: 61 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x33)) < 0) 62 + ctrl->value = sn9c102_i2c_read(cam, 0x33); 63 + if (ctrl->value < 0) 62 64 return -EIO; 63 65 ctrl->value = 0x3f - (ctrl->value & 0x3f); 64 66 return 0; 65 67 case SN9C102_V4L2_CID_GREEN_BALANCE: 66 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x32)) < 0) 68 + ctrl->value = sn9c102_i2c_read(cam, 0x32); 69 + if (ctrl->value < 0) 67 70 return -EIO; 68 71 ctrl->value = 0x3f - (ctrl->value & 0x3f); 69 72 return 0; 70 73 case SN9C102_V4L2_CID_RESET_LEVEL: 71 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x30)) < 0) 74 + ctrl->value = sn9c102_i2c_read(cam, 0x30); 75 + if (ctrl->value < 0) 72 76 return -EIO; 73 77 ctrl->value &= 0x3f; 74 78 return 0; 75 79 case SN9C102_V4L2_CID_PIXEL_BIAS_VOLTAGE: 76 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x34)) < 0) 80 + ctrl->value = sn9c102_i2c_read(cam, 0x34); 81 + if (ctrl->value < 0) 77 82 return -EIO; 78 83 ctrl->value &= 0x07; 79 84 return 0;

+10 -5

drivers/staging/media/sn9c102/sn9c102_hv7131r.c

··· 142 142 { 143 143 switch (ctrl->id) { 144 144 case V4L2_CID_GAIN: 145 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x30)) < 0) 145 + ctrl->value = sn9c102_i2c_read(cam, 0x30); 146 + if (ctrl->value < 0) 146 147 return -EIO; 147 148 return 0; 148 149 case V4L2_CID_RED_BALANCE: 149 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x31)) < 0) 150 + ctrl->value = sn9c102_i2c_read(cam, 0x31); 151 + if (ctrl->value < 0) 150 152 return -EIO; 151 153 ctrl->value = ctrl->value & 0x3f; 152 154 return 0; 153 155 case V4L2_CID_BLUE_BALANCE: 154 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x33)) < 0) 156 + ctrl->value = sn9c102_i2c_read(cam, 0x33); 157 + if (ctrl->value < 0) 155 158 return -EIO; 156 159 ctrl->value = ctrl->value & 0x3f; 157 160 return 0; 158 161 case SN9C102_V4L2_CID_GREEN_BALANCE: 159 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x32)) < 0) 162 + ctrl->value = sn9c102_i2c_read(cam, 0x32); 163 + if (ctrl->value < 0) 160 164 return -EIO; 161 165 ctrl->value = ctrl->value & 0x3f; 162 166 return 0; 163 167 case V4L2_CID_BLACK_LEVEL: 164 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x01)) < 0) 168 + ctrl->value = sn9c102_i2c_read(cam, 0x01); 169 + if (ctrl->value < 0) 165 170 return -EIO; 166 171 ctrl->value = (ctrl->value & 0x08) ? 1 : 0; 167 172 return 0;

+16 -8

drivers/staging/media/sn9c102/sn9c102_ov7630.c

··· 260 260 261 261 switch (ctrl->id) { 262 262 case V4L2_CID_EXPOSURE: 263 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x10)) < 0) 263 + ctrl->value = sn9c102_i2c_read(cam, 0x10); 264 + if (ctrl->value < 0) 264 265 return -EIO; 265 266 break; 266 267 case V4L2_CID_RED_BALANCE: ··· 281 280 break; 282 281 break; 283 282 case V4L2_CID_GAIN: 284 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x00)) < 0) 283 + ctrl->value = sn9c102_i2c_read(cam, 0x00); 284 + if (ctrl->value < 0) 285 285 return -EIO; 286 286 ctrl->value &= 0x3f; 287 287 break; 288 288 case V4L2_CID_DO_WHITE_BALANCE: 289 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x0c)) < 0) 289 + ctrl->value = sn9c102_i2c_read(cam, 0x0c); 290 + if (ctrl->value < 0) 290 291 return -EIO; 291 292 ctrl->value &= 0x3f; 292 293 break; 293 294 case V4L2_CID_WHITENESS: 294 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x0d)) < 0) 295 + ctrl->value = sn9c102_i2c_read(cam, 0x0d); 296 + if (ctrl->value < 0) 295 297 return -EIO; 296 298 ctrl->value &= 0x3f; 297 299 break; 298 300 case V4L2_CID_AUTOGAIN: 299 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x13)) < 0) 301 + ctrl->value = sn9c102_i2c_read(cam, 0x13); 302 + if (ctrl->value < 0) 300 303 return -EIO; 301 304 ctrl->value &= 0x01; 302 305 break; 303 306 case V4L2_CID_VFLIP: 304 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x75)) < 0) 307 + ctrl->value = sn9c102_i2c_read(cam, 0x75); 308 + if (ctrl->value < 0) 305 309 return -EIO; 306 310 ctrl->value = (ctrl->value & 0x80) ? 1 : 0; 307 311 break; 308 312 case SN9C102_V4L2_CID_GAMMA: 309 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x14)) < 0) 313 + ctrl->value = sn9c102_i2c_read(cam, 0x14); 314 + if (ctrl->value < 0) 310 315 return -EIO; 311 316 ctrl->value = (ctrl->value & 0x02) ? 1 : 0; 312 317 break; 313 318 case SN9C102_V4L2_CID_BAND_FILTER: 314 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x2d)) < 0) 319 + ctrl->value = sn9c102_i2c_read(cam, 0x2d); 320 + if (ctrl->value < 0) 315 321 return -EIO; 316 322 ctrl->value = (ctrl->value & 0x02) ? 1 : 0; 317 323 break;

+16 -8

drivers/staging/media/sn9c102/sn9c102_ov7660.c

··· 278 278 279 279 switch (ctrl->id) { 280 280 case V4L2_CID_EXPOSURE: 281 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x10)) < 0) 281 + ctrl->value = sn9c102_i2c_read(cam, 0x10); 282 + if (ctrl->value < 0) 282 283 return -EIO; 283 284 break; 284 285 case V4L2_CID_DO_WHITE_BALANCE: 285 - if ((ctrl->value = sn9c102_read_reg(cam, 0x02)) < 0) 286 + ctrl->value = sn9c102_read_reg(cam, 0x02); 287 + if (ctrl->value < 0) 286 288 return -EIO; 287 289 ctrl->value = (ctrl->value & 0x04) ? 1 : 0; 288 290 break; 289 291 case V4L2_CID_RED_BALANCE: 290 - if ((ctrl->value = sn9c102_read_reg(cam, 0x05)) < 0) 292 + ctrl->value = sn9c102_read_reg(cam, 0x05); 293 + if (ctrl->value < 0) 291 294 return -EIO; 292 295 ctrl->value &= 0x7f; 293 296 break; 294 297 case V4L2_CID_BLUE_BALANCE: 295 - if ((ctrl->value = sn9c102_read_reg(cam, 0x06)) < 0) 298 + ctrl->value = sn9c102_read_reg(cam, 0x06); 299 + if (ctrl->value < 0) 296 300 return -EIO; 297 301 ctrl->value &= 0x7f; 298 302 break; 299 303 case SN9C102_V4L2_CID_GREEN_BALANCE: 300 - if ((ctrl->value = sn9c102_read_reg(cam, 0x07)) < 0) 304 + ctrl->value = sn9c102_read_reg(cam, 0x07); 305 + if (ctrl->value < 0) 301 306 return -EIO; 302 307 ctrl->value &= 0x7f; 303 308 break; 304 309 case SN9C102_V4L2_CID_BAND_FILTER: 305 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x3b)) < 0) 310 + ctrl->value = sn9c102_i2c_read(cam, 0x3b); 311 + if (ctrl->value < 0) 306 312 return -EIO; 307 313 ctrl->value &= 0x08; 308 314 break; 309 315 case V4L2_CID_GAIN: 310 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x00)) < 0) 316 + ctrl->value = sn9c102_i2c_read(cam, 0x00); 317 + if (ctrl->value < 0) 311 318 return -EIO; 312 319 ctrl->value &= 0x1f; 313 320 break; 314 321 case V4L2_CID_AUTOGAIN: 315 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x13)) < 0) 322 + ctrl->value = sn9c102_i2c_read(cam, 0x13); 323 + if (ctrl->value < 0) 316 324 return -EIO; 317 325 ctrl->value &= 0x01; 318 326 break;

+12 -6

drivers/staging/media/sn9c102/sn9c102_pas106b.c

··· 62 62 } 63 63 return 0; 64 64 case V4L2_CID_RED_BALANCE: 65 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x0c)) < 0) 65 + ctrl->value = sn9c102_i2c_read(cam, 0x0c); 66 + if (ctrl->value < 0) 66 67 return -EIO; 67 68 ctrl->value &= 0x1f; 68 69 return 0; 69 70 case V4L2_CID_BLUE_BALANCE: 70 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x09)) < 0) 71 + ctrl->value = sn9c102_i2c_read(cam, 0x09); 72 + if (ctrl->value < 0) 71 73 return -EIO; 72 74 ctrl->value &= 0x1f; 73 75 return 0; 74 76 case V4L2_CID_GAIN: 75 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x0e)) < 0) 77 + ctrl->value = sn9c102_i2c_read(cam, 0x0e); 78 + if (ctrl->value < 0) 76 79 return -EIO; 77 80 ctrl->value &= 0x1f; 78 81 return 0; 79 82 case V4L2_CID_CONTRAST: 80 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x0f)) < 0) 83 + ctrl->value = sn9c102_i2c_read(cam, 0x0f); 84 + if (ctrl->value < 0) 81 85 return -EIO; 82 86 ctrl->value &= 0x07; 83 87 return 0; 84 88 case SN9C102_V4L2_CID_GREEN_BALANCE: 85 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x0a)) < 0) 89 + ctrl->value = sn9c102_i2c_read(cam, 0x0a); 90 + if (ctrl->value < 0) 86 91 return -EIO; 87 92 ctrl->value = (ctrl->value & 0x1f) << 1; 88 93 return 0; 89 94 case SN9C102_V4L2_CID_DAC_MAGNITUDE: 90 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x08)) < 0) 95 + ctrl->value = sn9c102_i2c_read(cam, 0x08); 96 + if (ctrl->value < 0) 91 97 return -EIO; 92 98 ctrl->value &= 0xf8; 93 99 return 0;

+10 -5

drivers/staging/media/sn9c102/sn9c102_pas202bcb.c

··· 92 92 } 93 93 return 0; 94 94 case V4L2_CID_RED_BALANCE: 95 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x09)) < 0) 95 + ctrl->value = sn9c102_i2c_read(cam, 0x09); 96 + if (ctrl->value < 0) 96 97 return -EIO; 97 98 ctrl->value &= 0x0f; 98 99 return 0; 99 100 case V4L2_CID_BLUE_BALANCE: 100 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x07)) < 0) 101 + ctrl->value = sn9c102_i2c_read(cam, 0x07); 102 + if (ctrl->value < 0) 101 103 return -EIO; 102 104 ctrl->value &= 0x0f; 103 105 return 0; 104 106 case V4L2_CID_GAIN: 105 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x10)) < 0) 107 + ctrl->value = sn9c102_i2c_read(cam, 0x10); 108 + if (ctrl->value < 0) 106 109 return -EIO; 107 110 ctrl->value &= 0x1f; 108 111 return 0; 109 112 case SN9C102_V4L2_CID_GREEN_BALANCE: 110 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x08)) < 0) 113 + ctrl->value = sn9c102_i2c_read(cam, 0x08); 114 + if (ctrl->value < 0) 111 115 return -EIO; 112 116 ctrl->value &= 0x0f; 113 117 return 0; 114 118 case SN9C102_V4L2_CID_DAC_MAGNITUDE: 115 - if ((ctrl->value = sn9c102_i2c_read(cam, 0x0c)) < 0) 119 + ctrl->value = sn9c102_i2c_read(cam, 0x0c); 120 + if (ctrl->value < 0) 116 121 return -EIO; 117 122 return 0; 118 123 default: