Commit 4c29e80a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Hans de Goede
Browse files

platform/x86: int3472: make common part a separate module 



Linking an object file into multiple modules is not supported
and causes a W=1 warning:

scripts/Makefile.build:236: drivers/platform/x86/intel/int3472/Makefile: common.o is added to multiple modules: intel_skl_int3472_discrete intel_skl_int3472_tps68470

Split out the common part here into a separate module to make it
more reliable.

Fixes: a2f9fbc2 ("platform/x86: int3472: Split into 2 drivers")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20240529095009.1895618-1-arnd@kernel.org


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent a720dee5

drivers/platform/x86/intel/int3472/Makefile

+6 −3
Original line number Diff line number Diff line 
obj-$(CONFIG_INTEL_SKL_INT3472)		+= intel_skl_int3472_discrete.o \

					   intel_skl_int3472_tps68470.o

intel_skl_int3472_discrete-y		:= discrete.o clk_and_regulator.o led.o common.o

intel_skl_int3472_tps68470-y		:= tps68470.o tps68470_board_data.o common.o
 
					   intel_skl_int3472_tps68470.o \

					   intel_skl_int3472_common.o

intel_skl_int3472_discrete-y		:= discrete.o clk_and_regulator.o led.o

intel_skl_int3472_tps68470-y		:= tps68470.o tps68470_board_data.o



intel_skl_int3472_common-y		+= common.o

drivers/platform/x86/intel/int3472/common.c

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ union acpi_object *skl_int3472_get_acpi_buffer(struct acpi_device *adev, char *i 


	return obj;

}

EXPORT_SYMBOL_GPL(skl_int3472_get_acpi_buffer);



int skl_int3472_fill_cldb(struct acpi_device *adev, struct int3472_cldb *cldb)

{
@@ -52,6 +53,7 @@ int skl_int3472_fill_cldb(struct acpi_device *adev, struct int3472_cldb *cldb) 
	kfree(obj);

	return ret;

}

EXPORT_SYMBOL_GPL(skl_int3472_fill_cldb);



/* sensor_adev_ret may be NULL, name_ret must not be NULL */

int skl_int3472_get_sensor_adev_and_name(struct device *dev,
@@ -80,3 +82,8 @@ int skl_int3472_get_sensor_adev_and_name(struct device *dev, 


	return ret;

}

EXPORT_SYMBOL_GPL(skl_int3472_get_sensor_adev_and_name);



MODULE_DESCRIPTION("Intel SkyLake INT3472 ACPI Device Driver library");

MODULE_AUTHOR("Daniel Scally <djrscally@gmail.com>");

MODULE_LICENSE("GPL");