Commit f4ceb2a0 authored by José Expósito's avatar José Expósito Committed by Jiri Kosina
Browse files

HID: uclogic: Avoid linking common code into multiple modules 



The hid-uclogic-params.o and hid-uclogic-rdesc.o files are linked
into both the driver module and the unit test, which triggers a
W=1 warning:

scripts/Makefile.build:236: drivers/hid/Makefile: hid-uclogic-rdesc.o is added to multiple modules: hid-uclogic hid-uclogic-test
scripts/Makefile.build:236: drivers/hid/Makefile: hid-uclogic-params.o is added to multiple modules: hid-uclogic hid-uclogic-test

Avoids this by moving these two files into a separate module
that is used by the driver and the unit test.

Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJosé Expósito <jose.exposito89@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent a3a5a37e

drivers/hid/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -154,10 +154,8 @@ obj-$(CONFIG_HID_WINWING) += hid-winwing.o 
obj-$(CONFIG_HID_SENSOR_HUB)	+= hid-sensor-hub.o

obj-$(CONFIG_HID_SENSOR_CUSTOM_SENSOR)	+= hid-sensor-custom.o



hid-uclogic-test-objs		:= hid-uclogic-rdesc.o \

				   hid-uclogic-params.o \

				   hid-uclogic-rdesc-test.o

obj-$(CONFIG_HID_KUNIT_TEST)	+= hid-uclogic-test.o

hid-uclogic-test-objs		:= hid-uclogic-rdesc-test.o

obj-$(CONFIG_HID_KUNIT_TEST)	+= hid-uclogic.o hid-uclogic-test.o



obj-$(CONFIG_USB_HID)		+= usbhid/

obj-$(CONFIG_USB_MOUSE)		+= usbhid/

drivers/hid/hid-uclogic-rdesc-test.c

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#include <kunit/test.h>

#include "./hid-uclogic-rdesc.h"



MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);



struct uclogic_template_case {

	const char *name;

	const __u8 *template;

drivers/hid/hid-uclogic-rdesc.c

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "hid-uclogic-rdesc.h"

#include <linux/slab.h>

#include <asm/unaligned.h>

#include <kunit/visibility.h>



/* Fixed WP4030U report descriptor */

__u8 uclogic_rdesc_wp4030u_fixed_arr[] = {
@@ -1242,3 +1243,4 @@ __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr, 


	return rdesc_ptr;

}

EXPORT_SYMBOL_IF_KUNIT(uclogic_rdesc_template_apply);