Commit fcea0ccf authored by Sudeep Holla's avatar Sudeep Holla Committed by Catalin Marinas
Browse files

ACPI: bus: Consolidate all arm specific initialisation into acpi_arm_init() 



Move all of the ARM-specific initialization into one function namely
acpi_arm_init(), so it is not necessary to modify/update bus.c every
time a new piece of it is added.

Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Suggested-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarHanjun Guo <guohanjun@huawei.com>
Link: https://lore.kernel.org/r/CAJZ5v0iBZRZmV_oU+VurqxnVMbFN_ttqrL=cLh0sUH+=u0PYsw@mail.gmail.com


Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Reviewed-by: default avatarLorenzo Pieralisi <lpieralisi@kernel.org>
Acked-by: default avatarRafael J. Wysocki <rafael@kernel.org>
Reviewed-by: default avatarShaoqin Huang <shahuang@redhat.com>
Link: https://lore.kernel.org/r/20230606093531.2746732-1-sudeep.holla@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 44c026a7

drivers/acpi/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ obj-$(CONFIG_ACPI_AGDI) += agdi.o 
obj-$(CONFIG_ACPI_IORT) 	+= iort.o

obj-$(CONFIG_ACPI_GTDT) 	+= gtdt.o

obj-$(CONFIG_ACPI_APMT) 	+= apmt.o

obj-y				+= dma.o
 
obj-y				+= dma.o init.o

drivers/acpi/arm64/agdi.c

+1 −1
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 
#define pr_fmt(fmt) "ACPI: AGDI: " fmt



#include <linux/acpi.h>

#include <linux/acpi_agdi.h>

#include <linux/arm_sdei.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/platform_device.h>

#include "init.h"



struct agdi_data {

	int sdei_event;

drivers/acpi/arm64/apmt.c

+1 −1
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ 
#define pr_fmt(fmt)	"ACPI: APMT: " fmt



#include <linux/acpi.h>

#include <linux/acpi_apmt.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/platform_device.h>

#include "init.h"



#define DEV_NAME "arm-cs-arch-pmu"

drivers/acpi/arm64/init.c

0 → 100644
+13 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

#include <linux/acpi.h>

#include "init.h"



void __init acpi_arm_init(void)

{

	if (IS_ENABLED(CONFIG_ACPI_AGDI))

		acpi_agdi_init();

	if (IS_ENABLED(CONFIG_ACPI_APMT))

		acpi_apmt_init();

	if (IS_ENABLED(CONFIG_ACPI_IORT))

		acpi_iort_init();

}

include/linux/acpi_agdi.h→drivers/acpi/arm64/init.h

+6 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

#include <linux/init.h>



#ifndef __ACPI_AGDI_H__

#define __ACPI_AGDI_H__



#include <linux/acpi.h>



#ifdef CONFIG_ACPI_AGDI

void __init acpi_agdi_init(void);

#else

static inline void acpi_agdi_init(void) {}

#endif

#endif /* __ACPI_AGDI_H__ */
 
void __init acpi_apmt_init(void);

void __init acpi_iort_init(void);