From: Bjorn Helgaas <bhelgaas@google.com>

I'm sorry to propose this, but it seems like ongoing confusion to have
"pwrctl" and "bwctrl" (different ctl/ctrl suffixes).

pwrctl was merged for v6.11, so I would propose changing bwctrl to match it
except that we already have several "ctrl" files in PCI hotplug drivers,
and in the wider kernel, the "ctrl" filename suffix outnumbers "ctl" by
about two to one.


Bjorn Helgaas (2):
  PCI/pwrctrl: Rename pwrctl files to pwrctrl
  PCI/pwrctrl: Rename pwrctrl functions and structures

 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        | 88 +++++++++----------
 .../pci-pwrctrl-pwrseq.c}                     | 34 +++----
 drivers/pci/remove.c                          |  4 +-
 include/linux/{pci-pwrctl.h => pci-pwrctrl.h} | 22 ++---
 10 files changed, 84 insertions(+), 84 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 (50%)
 rename drivers/pci/{pwrctl/pci-pwrctl-pwrseq.c => pwrctrl/pci-pwrctrl-pwrseq.c} (64%)
 rename include/linux/{pci-pwrctl.h => pci-pwrctrl.h} (69%)

-- 
2.34.1

Hello,

> I'm sorry to propose this, but it seems like ongoing confusion to have
> "pwrctl" and "bwctrl" (different ctl/ctrl suffixes).
> 
> pwrctl was merged for v6.11, so I would propose changing bwctrl to match it
> except that we already have several "ctrl" files in PCI hotplug drivers,
> and in the wider kernel, the "ctrl" filename suffix outnumbers "ctl" by
> about two to one.

For the entire series:

  Acked-by: Krzysztof Wilczyński <kw@linux.com>

	Krzysztof