[1/2] PCI/pwrctrl: Rename pwrctl files to pwrctrl

Commit Message

Bjorn Helgaas Nov. 15, 2024, 9:44 p.m. UTC

From: Bjorn Helgaas <[e-mail]>

To slightly reduce confusion between "pwrctl" (the power controller and
power sequencing framework) and "bwctrl" (the bandwidth controller),
rename "pwrctl" to "pwrctrl" so they use the same "ctrl" suffix.

Rename drivers/pci/pwrctl/ to drivers/pci/pwrctrl/, including the related
MAINTAINERS, include file (include/linux/pci-pwrctl.h), Makefile, and
Kconfig changes.

This is the minimal rename of files only.  A subsequent commit will rename
functions and data structures.

Signed-off-by: Bjorn Helgaas <[e-mail]>
---
 MAINTAINERS                                                 | 4 ++--
 drivers/pci/Kconfig                                         | 2 +-
 drivers/pci/Makefile                                        | 2 +-
 drivers/pci/pwrctl/Makefile                                 | 6 ------
 drivers/pci/{pwrctl => pwrctrl}/Kconfig                     | 0
 drivers/pci/pwrctrl/Makefile                                | 6 ++++++
 drivers/pci/{pwrctl => pwrctrl}/core.c                      | 2 +-
 .../pci-pwrctl-pwrseq.c => pwrctrl/pci-pwrctrl-pwrseq.c}    | 2 +-
 include/linux/{pci-pwrctl.h => pci-pwrctrl.h}               | 0
 9 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 drivers/pci/pwrctl/Makefile
 rename drivers/pci/{pwrctl => pwrctrl}/Kconfig (100%)
 create mode 100644 drivers/pci/pwrctrl/Makefile
 rename drivers/pci/{pwrctl => pwrctrl}/core.c (99%)
 rename drivers/pci/{pwrctl/pci-pwrctl-pwrseq.c => pwrctrl/pci-pwrctrl-pwrseq.c} (98%)
 rename include/linux/{pci-pwrctl.h => pci-pwrctrl.h} (100%)

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index c27f3190737f..1a6096135424 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17910,8 +17910,8 @@  M:	Bartosz Golaszewski <[e-mail]>
 L:	[e-mail]
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
-F:	drivers/pci/pwrctl/*
-F:	include/linux/pci-pwrctl.h
+F:	drivers/pci/pwrctrl/*
+F:	include/linux/pci-pwrctrl.h
 
 PCI SUBSYSTEM
 M:	Bjorn Helgaas <[e-mail]>
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 0d94e4a967d8..e1c025698a28 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -305,6 +305,6 @@  source "drivers/pci/hotplug/Kconfig"
 source "drivers/pci/controller/Kconfig"
 source "drivers/pci/endpoint/Kconfig"
 source "drivers/pci/switch/Kconfig"
-source "drivers/pci/pwrctl/Kconfig"
+source "drivers/pci/pwrctrl/Kconfig"
 
 endif
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 374c5c06d92f..39a07890abd1 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -9,7 +9,7 @@  obj-$(CONFIG_PCI)		+= access.o bus.o probe.o host-bridge.o \
 
 obj-$(CONFIG_PCI)		+= msi/
 obj-$(CONFIG_PCI)		+= pcie/
-obj-$(CONFIG_PCI)		+= pwrctl/
+obj-$(CONFIG_PCI)		+= pwrctrl/
 
 ifdef CONFIG_PCI
 obj-$(CONFIG_PROC_FS)		+= proc.o
diff --git a/drivers/pci/pwrctl/Makefile b/drivers/pci/pwrctl/Makefile
deleted file mode 100644
index d308aae4800c..000000000000
--- a/drivers/pci/pwrctl/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@ 
-# SPDX-License-Identifier: GPL-2.0-only
-
-obj-$(CONFIG_PCI_PWRCTL)		+= pci-pwrctl-core.o
-pci-pwrctl-core-y			:= core.o
-
-obj-$(CONFIG_PCI_PWRCTL_PWRSEQ)		+= pci-pwrctl-pwrseq.o
diff --git a/drivers/pci/pwrctl/Kconfig b/drivers/pci/pwrctrl/Kconfig
similarity index 100%
rename from drivers/pci/pwrctl/Kconfig
rename to drivers/pci/pwrctrl/Kconfig
diff --git a/drivers/pci/pwrctrl/Makefile b/drivers/pci/pwrctrl/Makefile
new file mode 100644
index 000000000000..75c7ce531c7e
--- /dev/null
+++ b/drivers/pci/pwrctrl/Makefile
@@ -0,0 +1,6 @@ 
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_PCI_PWRCTL)		+= pci-pwrctrl-core.o
+pci-pwrctrl-core-y			:= core.o
+
+obj-$(CONFIG_PCI_PWRCTL_PWRSEQ)		+= pci-pwrctrl-pwrseq.o
diff --git a/drivers/pci/pwrctl/core.c b/drivers/pci/pwrctrl/core.c
similarity index 99%
rename from drivers/pci/pwrctl/core.c
rename to drivers/pci/pwrctrl/core.c
index 01d913b60316..8a0b4219571d 100644
--- a/drivers/pci/pwrctl/core.c
+++ b/drivers/pci/pwrctrl/core.c
@@ -7,7 +7,7 @@ 
 #include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
-#include <linux/pci-pwrctl.h>
+#include <linux/pci-pwrctrl.h>
 #include <linux/property.h>
 #include <linux/slab.h>
 
diff --git a/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c b/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
similarity index 98%
rename from drivers/pci/pwrctl/pci-pwrctl-pwrseq.c
rename to drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
index a23a4312574b..cc19ad61dd6e 100644
--- a/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c
+++ b/drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
@@ -7,7 +7,7 @@ 
 #include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/pci-pwrctl.h>
+#include <linux/pci-pwrctrl.h>
 #include <linux/platform_device.h>
 #include <linux/pwrseq/consumer.h>
 #include <linux/slab.h>
diff --git a/include/linux/pci-pwrctl.h b/include/linux/pci-pwrctrl.h
similarity index 100%
rename from include/linux/pci-pwrctl.h
rename to include/linux/pci-pwrctrl.h