Skip to content

Commit b88cbaa

Browse files
bjorn-helgaaskwilczynski
authored andcommitted
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>
1 parent 681725a commit b88cbaa

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17910,8 +17910,8 @@ M: Bartosz Golaszewski <brgl@bgdev.pl>
1791017910
L: linux-pci@vger.kernel.org
1791117911
S: Maintained
1791217912
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
17913-
F: drivers/pci/pwrctl/*
17914-
F: include/linux/pci-pwrctl.h
17913+
F: drivers/pci/pwrctrl/*
17914+
F: include/linux/pci-pwrctrl.h
1791517915

1791617916
PCI SUBSYSTEM
1791717917
M: Bjorn Helgaas <bhelgaas@google.com>

drivers/pci/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,6 @@ source "drivers/pci/hotplug/Kconfig"
305305
source "drivers/pci/controller/Kconfig"
306306
source "drivers/pci/endpoint/Kconfig"
307307
source "drivers/pci/switch/Kconfig"
308-
source "drivers/pci/pwrctl/Kconfig"
308+
source "drivers/pci/pwrctrl/Kconfig"
309309

310310
endif

drivers/pci/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ obj-$(CONFIG_PCI) += access.o bus.o probe.o host-bridge.o \
99

1010
obj-$(CONFIG_PCI) += msi/
1111
obj-$(CONFIG_PCI) += pcie/
12-
obj-$(CONFIG_PCI) += pwrctl/
12+
obj-$(CONFIG_PCI) += pwrctrl/
1313

1414
ifdef CONFIG_PCI
1515
obj-$(CONFIG_PROC_FS) += proc.o

drivers/pci/pwrctl/Makefile

Lines changed: 0 additions & 6 deletions
This file was deleted.
File renamed without changes.

drivers/pci/pwrctrl/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
obj-$(CONFIG_PCI_PWRCTL) += pci-pwrctrl-core.o
4+
pci-pwrctrl-core-y := core.o
5+
6+
obj-$(CONFIG_PCI_PWRCTL_PWRSEQ) += pci-pwrctrl-pwrseq.o

drivers/pci/pwrctl/core.c renamed to drivers/pci/pwrctrl/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <linux/export.h>
88
#include <linux/kernel.h>
99
#include <linux/pci.h>
10-
#include <linux/pci-pwrctl.h>
10+
#include <linux/pci-pwrctrl.h>
1111
#include <linux/property.h>
1212
#include <linux/slab.h>
1313

drivers/pci/pwrctl/pci-pwrctl-pwrseq.c renamed to drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <linux/mod_devicetable.h>
88
#include <linux/module.h>
99
#include <linux/of.h>
10-
#include <linux/pci-pwrctl.h>
10+
#include <linux/pci-pwrctrl.h>
1111
#include <linux/platform_device.h>
1212
#include <linux/pwrseq/consumer.h>
1313
#include <linux/slab.h>
File renamed without changes.

0 commit comments

Comments
 (0)