[PATCH] Re: svn commit: r262439 - head/sys/dev/usb/input

[David Wolfskill]

I encountered an error during buildkernel:

...
===> usb/atp (all)
--- atp.o ---
clang -O2 -pipe -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc   
-DHAVE_KERNEL_OPTION_HEADERS -include 
/common/S4/obj/usr/src/sys/CANARY/opt_global.h -I. -I@ -I@/contrib/altq 
-fno-common -gdwarf-2 -I/common/S4/obj/usr/src/sys/CANARY  -mno-aes -mno-avx 
-mno-mmx -mno-sse -msoft-float -ffreestanding -fstack-protector 
-std=iso9899:1999 -Qunused-arguments  -fstack-protector -Wall -Wredundant-decls 
-Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith 
-Winline -Wcast-qual  -Wundef -Wno-pointer-sign -fformat-extensions  
-Wmissing-include-dirs -fdiagnostics-show-option  
-Wno-error-tautological-compare -Wno-error-empty-body  
-Wno-error-parentheses-equality -Wno-unused-function   -c 
/usr/src/sys/modules/usb/atp/../../../dev/usb/input/atp.c
/usr/src/sys/modules/usb/atp/../../../dev/usb/input/atp.c:797:40: error: unused 
variable 'atp_sensor_data_interpreters' [-Werror,-Wunused-const-variable]
static const sensor_data_interpreter_t 
atp_sensor_data_interpreters[TRACKPAD_FAMILY_MAX] = {
                                       ^
1 error generated.
*** [atp.o] Error code 1


The attached patch worked for me.

Now running:

FreeBSD 11.0-CURRENT #1172  r262439M/262439:1100009: Mon Feb 24 08:06:04 PST 
2014     root@localhost:/common/S4/obj/usr/src/sys/CANARY  i386

Peace,
david
-- 
David H. Wolfskill                              da...@catwhisker.org
Taliban: Evil cowards with guns afraid of truth from a 14-year old girl.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.

Index: sys/dev/usb/input/atp.c
===================================================================
--- sys/dev/usb/input/atp.c	(revision 262439)
+++ sys/dev/usb/input/atp.c	(working copy)
@@ -794,11 +794,6 @@
 static void	     atp_reset_buf(struct atp_softc *);
 static void	     atp_add_to_queue(struct atp_softc *, int, int, int, uint32_t);
 
-static const sensor_data_interpreter_t atp_sensor_data_interpreters[TRACKPAD_FAMILY_MAX] = {
-	[TRACKPAD_FAMILY_FOUNTAIN_GEYSER] = fg_interpret_sensor_data,
-	[TRACKPAD_FAMILY_WELLSPRING]      = wsp_interpret_sensor_data,
-};
-
 /* Device methods. */
 static device_probe_t  atp_probe;
 static device_attach_t atp_attach;

pgpd4zSYOX4H_.pgp
Description: PGP signature