Skip to content

Commit 13bbf6a

Browse files
jhovoldbjorn-helgaas
authored andcommitted
PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
Commits b88cbaa ("PCI/pwrctrl: Rename pwrctl files to pwrctrl") and 3f925cd ("PCI/pwrctrl: Rename pwrctrl functions and structures") renamed the "pwrctl" framework to "pwrctrl" for consistency reasons. Rename also the Kconfig symbols so that they reflect the new name while adding entries for the deprecated ones. The old symbols can be removed once everything that depends on them has been updated. Note that no deprecated symbol is added for the new slot driver to avoid having to add a user visible option. Rename the new slot module to reflect the framework name and match the other pwrctrl modules. Signed-off-by: Johan Hovold <[email protected]> Signed-off-by: Krzysztof Wilczyński <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Acked-by: Manivannan Sadhasivam <[email protected]> Acked-by: Bartosz Golaszewski <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 8b926f2 commit 13bbf6a

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

drivers/pci/pwrctrl/Kconfig

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,33 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22

3-
config HAVE_PWRCTL
3+
config HAVE_PWRCTRL
44
bool
55

6-
config PCI_PWRCTL
6+
config PCI_PWRCTRL
77
tristate
88

9-
config PCI_PWRCTL_PWRSEQ
9+
config PCI_PWRCTRL_PWRSEQ
1010
tristate
1111
select POWER_SEQUENCING
12-
select PCI_PWRCTL
12+
select PCI_PWRCTRL
1313

14-
config PCI_PWRCTL_SLOT
14+
config PCI_PWRCTRL_SLOT
1515
tristate "PCI Power Control driver for PCI slots"
16-
select PCI_PWRCTL
16+
select PCI_PWRCTRL
1717
help
1818
Say Y here to enable the PCI Power Control driver to control the power
1919
state of PCI slots.
2020

2121
This is a generic driver that controls the power state of different
2222
PCI slots. The voltage regulators powering the rails of the PCI slots
2323
are expected to be defined in the devicetree node of the PCI bridge.
24+
25+
# deprecated
26+
config HAVE_PWRCTL
27+
bool
28+
select HAVE_PWRCTRL
29+
30+
# deprecated
31+
config PCI_PWRCTL_PWRSEQ
32+
tristate
33+
select PCI_PWRCTRL_PWRSEQ

drivers/pci/pwrctrl/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22

3-
obj-$(CONFIG_PCI_PWRCTL) += pci-pwrctrl-core.o
3+
obj-$(CONFIG_PCI_PWRCTRL) += pci-pwrctrl-core.o
44
pci-pwrctrl-core-y := core.o
55

6-
obj-$(CONFIG_PCI_PWRCTL_PWRSEQ) += pci-pwrctrl-pwrseq.o
6+
obj-$(CONFIG_PCI_PWRCTRL_PWRSEQ) += pci-pwrctrl-pwrseq.o
77

8-
obj-$(CONFIG_PCI_PWRCTL_SLOT) += pci-pwrctl-slot.o
9-
pci-pwrctl-slot-y := slot.o
8+
obj-$(CONFIG_PCI_PWRCTRL_SLOT) += pci-pwrctrl-slot.o
9+
pci-pwrctrl-slot-y := slot.o

0 commit comments

Comments
 (0)