diff --git a/sys/arm/allwinner/aw_pwm.c b/sys/arm/allwinner/aw_pwm.c
index 9a3666ca8f1c..67e5eec7dd76 100644
--- a/sys/arm/allwinner/aw_pwm.c
+++ b/sys/arm/allwinner/aw_pwm.c
@@ -226,7 +226,7 @@ aw_pwm_detach(device_t dev)
 }
 
 static int
-aw_pwm_channel_max(device_t dev, int *nchannel)
+aw_pwm_channel_count(device_t dev, int *nchannel)
 {
 
 	*nchannel = 1;
@@ -363,7 +363,7 @@ static device_method_t aw_pwm_methods[] = {
 
 	/* pwm interface */
 	DEVMETHOD(pwm_get_bus,			aw_pwm_get_bus),
-	DEVMETHOD(pwm_channel_max,		aw_pwm_channel_max),
+	DEVMETHOD(pwm_channel_count,		aw_pwm_channel_count),
 	DEVMETHOD(pwm_channel_config,		aw_pwm_channel_config),
 	DEVMETHOD(pwm_channel_get_config,	aw_pwm_channel_get_config),
 	DEVMETHOD(pwm_channel_enable,		aw_pwm_channel_enable),
diff --git a/sys/dev/pwm/pwm_if.m b/sys/dev/pwm/pwm_if.m
index 103f4db1fa29..fbac2066d49f 100644
--- a/sys/dev/pwm/pwm_if.m
+++ b/sys/dev/pwm/pwm_if.m
@@ -100,7 +100,7 @@ METHOD int channel_is_enabled {
 #
 # Get the number of channels
 #
-METHOD int channel_max {
+METHOD int channel_count {
 	device_t dev;
 	int *nchannel;
 };
diff --git a/sys/dev/pwm/pwmbus.c b/sys/dev/pwm/pwmbus.c
index 7170869d61b8..45265a4b556a 100644
--- a/sys/dev/pwm/pwmbus.c
+++ b/sys/dev/pwm/pwmbus.c
@@ -78,7 +78,7 @@ pwmbus_attach(device_t dev)
 	sc->busdev = dev;
 	sc->dev = device_get_parent(dev);
 
-	if (PWM_CHANNEL_MAX(sc->dev, &sc->nchannels) != 0 ||
+	if (PWM_CHANNEL_COUNT(sc->dev, &sc->nchannels) != 0 ||
 	    sc->nchannels == 0)
 		return (ENXIO);
 
diff --git a/sys/dev/pwm/pwmc.c b/sys/dev/pwm/pwmc.c
index 58cb78653446..36d2b0046b63 100644
--- a/sys/dev/pwm/pwmc.c
+++ b/sys/dev/pwm/pwmc.c
@@ -67,7 +67,7 @@ pwm_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
 	switch (cmd) {
 	case PWMMAXCHANNEL:
 		nchannel = -1;
-		rv = PWM_CHANNEL_MAX(sc->pdev, &nchannel);
+		rv = PWM_CHANNEL_COUNT(sc->pdev, &nchannel);
 		bcopy(&nchannel, data, sizeof(nchannel));
 		break;
 	case PWMSETSTATE: