From b93539730be09ecb45a0f31484529c9cf5f18a54 Mon Sep 17 00:00:00 2001
From: Ian Lepore <ian@FreeBSD.org>
Date: Sun, 16 Jun 2019 15:56:59 +0000
Subject: [PATCH] Rename pwmbus.h to ofw_pwm.h, because after all the recent
 changes, there is nothing left in the file that related to pwmbus at all.  It
 just contains prototypes for the functions implemented in dev/pwm.ofw_pwm.c,
 so name it accordingly and fix the include protect wrappers to match.

A new pwmbus.h will be coming along in a future commit.
---
 sys/arm/allwinner/aw_pwm.c          | 2 --
 sys/dev/pwm/ofw_pwm.c               | 4 +---
 sys/dev/pwm/{pwmbus.h => ofw_pwm.h} | 5 +++--
 sys/dev/pwm/pwmbus.c                | 2 --
 4 files changed, 4 insertions(+), 9 deletions(-)
 rename sys/dev/pwm/{pwmbus.h => ofw_pwm.h} (96%)

diff --git a/sys/arm/allwinner/aw_pwm.c b/sys/arm/allwinner/aw_pwm.c
index aef28ac0e43f..2471b52eb5fe 100644
--- a/sys/arm/allwinner/aw_pwm.c
+++ b/sys/arm/allwinner/aw_pwm.c
@@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/extres/clk/clk.h>
 
-#include <dev/pwm/pwmbus.h>
-
 #include "pwmbus_if.h"
 
 #define	AW_PWM_CTRL			0x00
diff --git a/sys/dev/pwm/ofw_pwm.c b/sys/dev/pwm/ofw_pwm.c
index d15e5a7e8040..a70c8919f727 100644
--- a/sys/dev/pwm/ofw_pwm.c
+++ b/sys/dev/pwm/ofw_pwm.c
@@ -38,9 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/pwm/pwmbus.h>
-
-#include "pwmbus_if.h"
+#include <dev/pwm/ofw_pwm.h>
 
 int
 pwm_get_by_ofw_propidx(device_t consumer, phandle_t node,
diff --git a/sys/dev/pwm/pwmbus.h b/sys/dev/pwm/ofw_pwm.h
similarity index 96%
rename from sys/dev/pwm/pwmbus.h
rename to sys/dev/pwm/ofw_pwm.h
index fbecce531424..00910907932a 100644
--- a/sys/dev/pwm/pwmbus.h
+++ b/sys/dev/pwm/ofw_pwm.h
@@ -28,7 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef _PWMBUS_H_
+#ifndef _OFW_PWM_H_
+#define _OFW_PWM_H_
 
 #include <dev/ofw/openfirm.h>
 
@@ -51,4 +52,4 @@ int pwm_get_by_ofw_property(device_t consumer, phandle_t node,
 int pwm_get_by_ofw_name(device_t consumer, phandle_t node, const char *name,
     pwm_channel_t *out_channel);
 
-#endif /* _PWMBUS_H_ */
+#endif /* _OFW_PWM_H_ */
diff --git a/sys/dev/pwm/pwmbus.c b/sys/dev/pwm/pwmbus.c
index a94ff487fd86..7039fde4b07d 100644
--- a/sys/dev/pwm/pwmbus.c
+++ b/sys/dev/pwm/pwmbus.c
@@ -41,8 +41,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 
-#include <dev/pwm/pwmbus.h>
-
 #include "pwmbus_if.h"
 
 struct pwmbus_channel_data {