diff options
| author | Narcisa Ana Maria Vasile <narcisaanamaria12@gmail.com> | 2017-03-07 17:22:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-07 20:11:38 +0100 |
| commit | 85fa002f2e9102ba3305c419badc9871ca3b1ae0 (patch) | |
| tree | 6b0f0051fba8999e4275fd0f198322637cf9dae7 /drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | |
| parent | fb1e87656e0f9c24cd6a9dbc664cdd493a70a57c (diff) | |
| download | op-kernel-dev-85fa002f2e9102ba3305c419badc9871ca3b1ae0.zip op-kernel-dev-85fa002f2e9102ba3305c419badc9871ca3b1ae0.tar.gz | |
staging: bcm2835-camera: Replace ternary operator with min_t macro
Use macro min_t to get the minimum of two values for readability.
Signed-off-by: Narcisa Ana Maria Vasile <narcisaanamaria12@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c')
| -rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index c9a68d4..ab85344 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -1539,9 +1539,7 @@ static int get_num_cameras(struct vchiq_mmal_instance *instance, pr_info("Failed to get camera info\n"); } for (i = 0; - i < (cam_info.num_cameras > num_resolutions ? - num_resolutions : - cam_info.num_cameras); + i < min_t(unsigned int, cam_info.num_cameras, num_resolutions); i++) { resolutions[i][0] = cam_info.cameras[i].max_width; resolutions[i][1] = cam_info.cameras[i].max_height; |
