From patchwork Fri Nov 15 21:44:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 843686 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3CB841E3790; Fri, 15 Nov 2024 21:44:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731707076; cv=none; b=QDS0QFvVlo9jsMKDQjdA0qKsy/zccJUbHzeY1NRcvDmybbhevHL3nZzlnv0imX5alIWjTExrOv9Yg9noLBki+HIQBKo9OzTLT3Fv89Q/NtBR4Ir52q10allLnGEbmarh74eugVHQPvFuFR8TnUj3O7DEjjpaUku9yEQuxXDw4G4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731707076; c=relaxed/simple; bh=fZFwIq8PDHhlM72b9JRyIOE2t9jKPIOKwKFpqiGsJPo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jaTaf/4/dV8jgZITBy98twSd9BdBNUTkQRcWLajqDb6iba/rpYF+AT+ntPHDhMBbj/z8+ncKyGOExWZffQ+Dj+S3LWws7152ZLYvjdVMUQtwk0C6ZqM4W4cc1HUPZ3DwnpsX0Z92RIuOnb8zjt0qyIROrglJTFKVU1jShfiwNsw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WQpsNzZA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WQpsNzZA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81767C4CEDE; Fri, 15 Nov 2024 21:44:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731707075; bh=fZFwIq8PDHhlM72b9JRyIOE2t9jKPIOKwKFpqiGsJPo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WQpsNzZAHzzeJOcXZs09Mf2PsOadmt+BC8vOk+hMoO+KODmb0iwBFUWNFmiAJfcst cuPYh5EUFb70r2Jcy2YoR/7Tcckdh8wDmKqpT7R3gRWXJGFfx09VZAdviEY0V6l0qK CZzkgU02CBHi9JbLGGJshOpKb3y9MmtcF5YvAnrOUEnfVZQR7RI7RxTDkp8hDbQSDH NSB0BkHTr7b+O+TyrPbUYg65phhxKzKe6GUXUqyTEy7AAYXF2rbi03AnbFbxXANwiB 9vFYhJ0bln9OwBNntXz0TAIkANh1l2O1mKqXUwomqOsgZ7Lj3adLINdhHHkBXdZOnz JEuKXIJNXyjFQ== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Bartosz Golaszewski , =?utf-8?q?Ilpo_J?= =?utf-8?q?=C3=A4rvinen?= , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , "Maciej W . Rozycki" , Jonathan Cameron , Lukas Wunner , Alexandru Gagniuc , Krishna chaitanya chundru , Srinivas Pandruvada , "Rafael J . Wysocki" , Smita Koralahalli , Daniel Lezcano , Amit Kucheria , Zhang Rui , Christophe JAILLET , Amit Pundir , Neil Armstrong , Caleb Connolly , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 1/2] PCI/pwrctrl: Rename pwrctl files to pwrctrl Date: Fri, 15 Nov 2024 15:44:27 -0600 Message-Id: <20241115214428.2061153-2-helgaas@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241115214428.2061153-1-helgaas@kernel.org> References: <20241115214428.2061153-1-helgaas@kernel.org> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Bjorn Helgaas 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 --- 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%) diff --git a/MAINTAINERS b/MAINTAINERS index c27f3190737f..1a6096135424 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17910,8 +17910,8 @@ M: Bartosz Golaszewski 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 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 #include #include -#include +#include #include #include 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 #include #include -#include +#include #include #include #include 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