PCI/pwrctrl: Rename pwrctl files to pwrctrl

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.

Link: https://lore.kernel.org/r/20241115214428.2061153-2-helgaas@kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Acked-by: Krzysztof Wilczyński <kw@linux.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index c27f3190737f8b85779bde5489639c8b899f4fd8..1a6096135424c71650897cdaf63a0d4a1a66e503 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17910,8 +17910,8 @@ M:      Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-pci@vger.kernel.org
 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 <bhelgaas@google.com>

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 0d94e4a967d81d50b9a3f3aebda56d37b36fc271..e1c025698a283c5ad795bdf29775107caee4797a 100644 (file)
--- 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 374c5c06d92f9ddc4c8dfc2663b1cc8c979f5b41..39a07890abd12817940b6c0a5c06f89a9b2afd08 100644 (file)
--- 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 (file)
index d308aae..0000000
--- 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 (file)
index 0000000..75c7ce5
--- /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 bb5a23712434150dff8b293b61fc050062ff7aab..88f06e9271bac1da0098359e3aa0df7eb9d63004 100644 (file)
--- 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 a23a4312574b9f4b61c1a0d59bcea5f89ac33670..cc19ad61dd6e804b441938ec64651543521c7d06 100644 (file)
--- 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