| Message ID | 20230703123739.28142-1-youkangren@vivo.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] crypto: qat - Replace the if statement with min() | expand |
On Mon, Jul 03, 2023 at 08:37:36PM +0800, You Kangren wrote: > mark UWORD_CPYBUF_SIZE with U suffix to make the type the same with > words_num and replace the if statement with min() Makes code shorter, Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: You Kangren <youkangren@vivo.com> > --- > drivers/crypto/intel/qat/qat_common/qat_uclo.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/crypto/intel/qat/qat_common/qat_uclo.c b/drivers/crypto/intel/qat/qat_common/qat_uclo.c > index ce837bcc1cab..bad65f154777 100644 > --- a/drivers/crypto/intel/qat/qat_common/qat_uclo.c > +++ b/drivers/crypto/intel/qat/qat_common/qat_uclo.c > @@ -5,13 +5,14 @@ > #include <linux/kernel.h> > #include <linux/delay.h> > #include <linux/pci_ids.h> > +#include <linux/minmax.h> > #include "adf_accel_devices.h" > #include "adf_common_drv.h" > #include "icp_qat_uclo.h" > #include "icp_qat_hal.h" > #include "icp_qat_fw_loader_handle.h" > > -#define UWORD_CPYBUF_SIZE 1024 > +#define UWORD_CPYBUF_SIZE 1024U > #define INVLD_UWORD 0xffffffffffull > #define PID_MINOR_REV 0xf > #define PID_MAJOR_REV (0xf << 4) > @@ -1986,10 +1987,7 @@ static void qat_uclo_wr_uimage_raw_page(struct icp_qat_fw_loader_handle *handle, > uw_relative_addr = 0; > words_num = encap_page->micro_words_num; > while (words_num) { > - if (words_num < UWORD_CPYBUF_SIZE) > - cpylen = words_num; > - else > - cpylen = UWORD_CPYBUF_SIZE; > + cpylen = min(words_num, UWORD_CPYBUF_SIZE); > > /* load the buffer */ > for (i = 0; i < cpylen; i++) > -- > 2.39.0 >
diff --git a/drivers/crypto/intel/qat/qat_common/qat_uclo.c b/drivers/crypto/intel/qat/qat_common/qat_uclo.c index ce837bcc1cab..bad65f154777 100644 --- a/drivers/crypto/intel/qat/qat_common/qat_uclo.c +++ b/drivers/crypto/intel/qat/qat_common/qat_uclo.c @@ -5,13 +5,14 @@ #include <linux/kernel.h> #include <linux/delay.h> #include <linux/pci_ids.h> +#include <linux/minmax.h> #include "adf_accel_devices.h" #include "adf_common_drv.h" #include "icp_qat_uclo.h" #include "icp_qat_hal.h" #include "icp_qat_fw_loader_handle.h" -#define UWORD_CPYBUF_SIZE 1024 +#define UWORD_CPYBUF_SIZE 1024U #define INVLD_UWORD 0xffffffffffull #define PID_MINOR_REV 0xf #define PID_MAJOR_REV (0xf << 4) @@ -1986,10 +1987,7 @@ static void qat_uclo_wr_uimage_raw_page(struct icp_qat_fw_loader_handle *handle, uw_relative_addr = 0; words_num = encap_page->micro_words_num; while (words_num) { - if (words_num < UWORD_CPYBUF_SIZE) - cpylen = words_num; - else - cpylen = UWORD_CPYBUF_SIZE; + cpylen = min(words_num, UWORD_CPYBUF_SIZE); /* load the buffer */ for (i = 0; i < cpylen; i++)
mark UWORD_CPYBUF_SIZE with U suffix to make the type the same with words_num and replace the if statement with min() Signed-off-by: You Kangren <youkangren@vivo.com> --- drivers/crypto/intel/qat/qat_common/qat_uclo.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)