Date: Wed, 4 May 2016 01:43:07 +0000 (UTC) From: Marcelo Araujo <araujo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299033 - head/sys/dev/hptiop Message-ID: <201605040143.u441h7No071871@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: araujo Date: Wed May 4 01:43:07 2016 New Revision: 299033 URL: https://svnweb.freebsd.org/changeset/base/299033 Log: Use imin() macro from sys/libkern.h. MFC after: 2 weeks. Modified: head/sys/dev/hptiop/hptiop.c Modified: head/sys/dev/hptiop/hptiop.c ============================================================================== --- head/sys/dev/hptiop/hptiop.c Wed May 4 01:36:19 2016 (r299032) +++ head/sys/dev/hptiop/hptiop.c Wed May 4 01:43:07 2016 (r299033) @@ -1241,7 +1241,7 @@ static int hptiop_post_ioctl_command_mv( req->header.result = IOP_RESULT_PENDING; req->header.flags = IOP_REQUEST_FLAG_OUTPUT_CONTEXT; size = req->header.size >> 8; - size = size > 3 ? 3 : size; + size = imin(3, size); req_phy = hba->ctlcfgcmd_phy | MVIOP_MU_QUEUE_ADDR_HOST_BIT | size; hptiop_mv_inbound_write(req_phy, hba); @@ -2561,7 +2561,7 @@ static void hptiop_post_req_mv(struct hp size = req->header.size >> 8; hptiop_mv_inbound_write(req_phy | MVIOP_MU_QUEUE_ADDR_HOST_BIT - | (size > 3 ? 3 : size), hba); + | imin(3, size), hba); } static void hptiop_post_req_mvfrey(struct hpt_iop_hba *hba,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605040143.u441h7No071871>