Skip to content

Commit 4c29e80

Browse files
arndbjwrdegoede
authored andcommitted
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: a2f9fbc ("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>
1 parent a720dee commit 4c29e80

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
obj-$(CONFIG_INTEL_SKL_INT3472) += intel_skl_int3472_discrete.o \
2-
intel_skl_int3472_tps68470.o
3-
intel_skl_int3472_discrete-y := discrete.o clk_and_regulator.o led.o common.o
4-
intel_skl_int3472_tps68470-y := tps68470.o tps68470_board_data.o common.o
2+
intel_skl_int3472_tps68470.o \
3+
intel_skl_int3472_common.o
4+
intel_skl_int3472_discrete-y := discrete.o clk_and_regulator.o led.o
5+
intel_skl_int3472_tps68470-y := tps68470.o tps68470_board_data.o
6+
7+
intel_skl_int3472_common-y += common.o

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ union acpi_object *skl_int3472_get_acpi_buffer(struct acpi_device *adev, char *i
2929

3030
return obj;
3131
}
32+
EXPORT_SYMBOL_GPL(skl_int3472_get_acpi_buffer);
3233

3334
int skl_int3472_fill_cldb(struct acpi_device *adev, struct int3472_cldb *cldb)
3435
{
@@ -52,6 +53,7 @@ int skl_int3472_fill_cldb(struct acpi_device *adev, struct int3472_cldb *cldb)
5253
kfree(obj);
5354
return ret;
5455
}
56+
EXPORT_SYMBOL_GPL(skl_int3472_fill_cldb);
5557

5658
/* sensor_adev_ret may be NULL, name_ret must not be NULL */
5759
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,
8082

8183
return ret;
8284
}
85+
EXPORT_SYMBOL_GPL(skl_int3472_get_sensor_adev_and_name);
86+
87+
MODULE_DESCRIPTION("Intel SkyLake INT3472 ACPI Device Driver library");
88+
MODULE_AUTHOR("Daniel Scally <djrscally@gmail.com>");
89+
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)