Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Arnd Bergmann <arnd@kernel.org>
To:     Ulf Hansson <ulf.hansson@linaro.org>,
        =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>,
        Manivannan Sadhasivam <mani@kernel.org>
Cc:     Arnd Bergmann <arnd@arndb.de>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Conor Dooley <conor.dooley@microchip.com>,
        Joel Stanley <joel@jms.id.au>,
        Paul Menzel <pmenzel@molgen.mpg.de>,
        Hal Feng <hal.feng@starfivetech.com>,
        Yinbo Zhu <zhuyinbo@loongson.cn>,
        =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= <j.neuschaefer@gmx.net>,
        Emil Renner Berthing <kernel@esmil.dk>,
        Walker Chen <walker.chen@starfivetech.com>,
        linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org,
        linux-actions@lists.infradead.org
Subject: [PATCH 2/2] genpd: move owl-sps-helper.c from drivers/soc
Date:   Wed, 26 Jul 2023 14:17:15 +0200
Message-Id: <20230726121724.3701240-2-arnd@kernel.org>
In-Reply-To: <20230726121724.3701240-1-arnd@kernel.org>
References: <20230726121724.3701240-1-arnd@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Arnd Bergmann <arnd@arndb.de>

Moving only one of the two files in drivers/soc/actions to drivers/genpd
caused a link failure in allmodconfig, as drivers/genpd is entered
for compile testing, but drivers/soc/actions accidentally got skipped:

x86_64-linux-gnu-ld: vmlinux.o: in function `owl_sps_set_power':
owl-sps.c:(.text+0x16e259d): undefined reference to `owl_sps_set_pg'

Move the other one as well to allow build testing to work correctly.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/genpd/actions/Makefile                  | 1 +
 drivers/{soc => genpd}/actions/owl-sps-helper.c | 0
 drivers/soc/Makefile                            | 1 -
 drivers/soc/actions/Makefile                    | 3 ---
 4 files changed, 1 insertion(+), 4 deletions(-)
 rename drivers/{soc => genpd}/actions/owl-sps-helper.c (100%)
 delete mode 100644 drivers/soc/actions/Makefile

diff --git a/drivers/genpd/actions/Makefile b/drivers/genpd/actions/Makefile
index e78c420a24540..7e8aa473d12d1 100644
--- a/drivers/genpd/actions/Makefile
+++ b/drivers/genpd/actions/Makefile
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0+
+obj-$(CONFIG_OWL_PM_DOMAINS_HELPER)	+= owl-sps-helper.o
 obj-$(CONFIG_OWL_PM_DOMAINS)		+= owl-sps.o
diff --git a/drivers/soc/actions/owl-sps-helper.c b/drivers/genpd/actions/owl-sps-helper.c
similarity index 100%
rename from drivers/soc/actions/owl-sps-helper.c
rename to drivers/genpd/actions/owl-sps-helper.c
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index efdcd42f68cb3..708eaad8f590d 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -3,7 +3,6 @@
 # Makefile for the Linux Kernel SOC specific device drivers.
 #
 
-obj-$(CONFIG_ARCH_ACTIONS)	+= actions/
 obj-y				+= apple/
 obj-y				+= aspeed/
 obj-$(CONFIG_ARCH_AT91)		+= atmel/
diff --git a/drivers/soc/actions/Makefile b/drivers/soc/actions/Makefile
deleted file mode 100644
index 4ac88fec2050a..0000000000000
--- a/drivers/soc/actions/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-obj-$(CONFIG_OWL_PM_DOMAINS_HELPER) += owl-sps-helper.o
-- 
2.39.2