]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
platform/x86: int3472: make common part a separate module
authorArnd Bergmann <arnd@arndb.de>
Wed, 29 May 2024 09:49:55 +0000 (11:49 +0200)
committerHans de Goede <hdegoede@redhat.com>
Mon, 5 Aug 2024 15:00:09 +0000 (17:00 +0200)
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: a2f9fbc247ee ("platform/x86: int3472: Split into 2 drivers")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20240529095009.1895618-1-arnd@kernel.org
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
drivers/platform/x86/intel/int3472/Makefile
drivers/platform/x86/intel/int3472/common.c

index 9f16cb51439734e8c8fe1083cb5b0c56751ba2a8..a8aba07bf1dc2aa8c37c9f93c672c0c459bc287e 100644 (file)
@@ -1,4 +1,7 @@
 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
index 9db2bb0bbba4bd90c1d8d46348ad47e1b2626184..b3a2578e06c1923808fc28e95cad59241dda3ca5 100644 (file)
@@ -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 @@ out_free_obj:
        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");