Date: Fri, 24 Feb 2017 21:20:48 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314223 - in stable/11/sys/dev: hpt27xx hptnr hptrr Message-ID: <201702242120.v1OLKmCT063253@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Fri Feb 24 21:20:48 2017 New Revision: 314223 URL: https://svnweb.freebsd.org/changeset/base/314223 Log: MFC r313554: Clean redundant MIN/MAX declarations in some HighPoint drivers. The hpt27xx(4), hptnr(4), and hptrr(4) drivers declare MIN() and MAX() internally which match the macros from sys/param.h. MIN() is not used, MAX is only used once and can be replaced with the max() version in libkern.h which operates on u_ints. MFC after: 2 weeks Modified: stable/11/sys/dev/hpt27xx/hpt27xx_osm_bsd.c stable/11/sys/dev/hpt27xx/ldm.h stable/11/sys/dev/hptnr/hptnr_osm_bsd.c stable/11/sys/dev/hptnr/ldm.h stable/11/sys/dev/hptrr/hptrr_osm_bsd.c stable/11/sys/dev/hptrr/ldm.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/hpt27xx/hpt27xx_osm_bsd.c ============================================================================== --- stable/11/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Fri Feb 24 21:19:40 2017 (r314222) +++ stable/11/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Fri Feb 24 21:20:48 2017 (r314223) @@ -297,7 +297,7 @@ static int hpt_flush_vdev(PVBUS_EXT vbus hpt_lock_vbus(vbus_ext); if (mIsArray(vd->type) && vd->u.array.transform) - count = MAX(vd->u.array.transform->source->cmds_per_request, + count = max(vd->u.array.transform->source->cmds_per_request, vd->u.array.transform->target->cmds_per_request); else count = vd->cmds_per_request; Modified: stable/11/sys/dev/hpt27xx/ldm.h ============================================================================== --- stable/11/sys/dev/hpt27xx/ldm.h Fri Feb 24 21:19:40 2017 (r314222) +++ stable/11/sys/dev/hpt27xx/ldm.h Fri Feb 24 21:20:48 2017 (r314223) @@ -59,10 +59,6 @@ extern "C" { #error "Please redefine MAX_PARTITIONS_PER_DISK!!!" #endif -#define MAX(a,b) (((a)>(b))?(a):(b)) -#define MIN(a,b) (((a)<(b))?(a):(b)) - - typedef char check_HPT_TIME_is_unsigned[ (HPT_TIME)(-1) > 0 ? 1 : -1 ]; #define hpt_time_after_eq(a, b) ((int)(a) - (int)(b) >= 0) Modified: stable/11/sys/dev/hptnr/hptnr_osm_bsd.c ============================================================================== --- stable/11/sys/dev/hptnr/hptnr_osm_bsd.c Fri Feb 24 21:19:40 2017 (r314222) +++ stable/11/sys/dev/hptnr/hptnr_osm_bsd.c Fri Feb 24 21:20:48 2017 (r314223) @@ -294,7 +294,7 @@ static int hpt_flush_vdev(PVBUS_EXT vbus hpt_assert_vbus_locked(vbus_ext); if (mIsArray(vd->type) && vd->u.array.transform) - count = MAX(vd->u.array.transform->source->cmds_per_request, + count = max(vd->u.array.transform->source->cmds_per_request, vd->u.array.transform->target->cmds_per_request); else count = vd->cmds_per_request; Modified: stable/11/sys/dev/hptnr/ldm.h ============================================================================== --- stable/11/sys/dev/hptnr/ldm.h Fri Feb 24 21:19:40 2017 (r314222) +++ stable/11/sys/dev/hptnr/ldm.h Fri Feb 24 21:20:48 2017 (r314223) @@ -58,9 +58,6 @@ extern "C" { #error "Please redefine MAX_PARTITIONS_PER_DISK!!!" #endif -#define MAX(a,b) (((a)>(b))?(a):(b)) -#define MIN(a,b) (((a)<(b))?(a):(b)) - typedef char check_HPT_TIME_is_unsigned[ (HPT_TIME)(-1) > 0 ? 1 : -1 ]; Modified: stable/11/sys/dev/hptrr/hptrr_osm_bsd.c ============================================================================== --- stable/11/sys/dev/hptrr/hptrr_osm_bsd.c Fri Feb 24 21:19:40 2017 (r314222) +++ stable/11/sys/dev/hptrr/hptrr_osm_bsd.c Fri Feb 24 21:20:48 2017 (r314223) @@ -300,7 +300,7 @@ static int hpt_flush_vdev(PVBUS_EXT vbus hpt_assert_vbus_locked(vbus_ext); if (mIsArray(vd->type) && vd->u.array.transform) - count = MAX(vd->u.array.transform->source->cmds_per_request, + count = max(vd->u.array.transform->source->cmds_per_request, vd->u.array.transform->target->cmds_per_request); else count = vd->cmds_per_request; Modified: stable/11/sys/dev/hptrr/ldm.h ============================================================================== --- stable/11/sys/dev/hptrr/ldm.h Fri Feb 24 21:19:40 2017 (r314222) +++ stable/11/sys/dev/hptrr/ldm.h Fri Feb 24 21:20:48 2017 (r314223) @@ -58,10 +58,6 @@ extern "C" { #error "Please redefine MAX_PARTITIONS_PER_DISK!!!" #endif -#define MAX(a,b) (((a)>(b))?(a):(b)) -#define MIN(a,b) (((a)<(b))?(a):(b)) - - typedef char check_HPT_TIME_is_unsigned[ (HPT_TIME)(-1) > 0 ? 1 : -1 ]; #define hpt_time_after_eq(a, b) ((long)(a) - (long)(b) >= 0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702242120.v1OLKmCT063253>