crypto: qat - use min_t macro
authorTadeusz Struk <tadeusz.struk@intel.com>
Fri, 25 Jul 2014 22:55:32 +0000 (15:55 -0700)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 1 Aug 2014 14:36:04 +0000 (22:36 +0800)
prefer min_t() macro over two open-coded logical tests

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/qat/qat_common/qat_uclo.c

index 17a9954f831e41414d3c2f159d338967c03ecf4a..b1a16eb5a36d7302f741af7e3bd13ff3c04c0008 100644 (file)
@@ -901,8 +901,8 @@ static int qat_uclo_set_ae_mode(struct icp_qat_fw_loader_handle *handle)
                              (unsigned long *)&handle->hal_handle->ae_mask))
                        continue;
                ae_data = &obj_handle->ae_data[ae];
-               for (s = 0; s < ae_data->slice_num && s < ICP_QAT_UCLO_MAX_CTX;
-                    s++) {
+               for (s = 0; s < min_t(unsigned int, ae_data->slice_num,
+                                     ICP_QAT_UCLO_MAX_CTX); s++) {
                        if (!obj_handle->ae_data[ae].ae_slices[s].encap_image)
                                continue;
                        uof_image = ae_data->ae_slices[s].encap_image->img_ptr;