drivers: Remove UPEKE2 driver

The device is already handled by upektc_img driver, and its sources
still exist in git if needed.

https://bugs.freedesktop.org/show_bug.cgi?id=106514

configure.ac

@@ -30,7 +30,6 @@ require_aeslib='no'
 require_aesX660='no'
 require_aes3k='no'
 require_nss='no'
-enable_upeke2='no'
 enable_upekts='no'
 enable_upektc='no'
 enable_upeksonly='no'
@@ -67,10 +66,6 @@ for driver in `echo ${drivers} | sed -e 's/,/ /g' -e 's/,$//g'`; do
 			AC_DEFINE([ENABLE_UPEKTS], [], [Build UPEK TouchStrip driver])
 			enable_upekts="yes"
 		;;
-		upeke2)
-			AC_DEFINE([ENABLE_UPEKE2], [], [Build UPEK Eikon 2])
-			enable_upeke2="yes"
-		;;
 		upektc)
 			AC_DEFINE([ENABLE_UPEKTC], [], [Build UPEK TouchChip driver])
 			enable_upektc="yes"
@@ -166,7 +161,6 @@ for driver in `echo ${drivers} | sed -e 's/,/ /g' -e 's/,$//g'`; do
 done
 
 AM_CONDITIONAL([ENABLE_UPEKTS], [test "$enable_upekts" = "yes"])
-AM_CONDITIONAL([ENABLE_UPEKE2], [test "$enable_upeke2" = "yes"])
 AM_CONDITIONAL([ENABLE_UPEKTC], [test "$enable_upektc" = "yes"])
 AM_CONDITIONAL([ENABLE_UPEKSONLY], [test "$enable_upeksonly" = "yes"])
 AM_CONDITIONAL([ENABLE_VCOM5S], [test "$enable_vcom5s" = "yes"])
@@ -325,11 +319,6 @@ if test x$enable_upekts != xno ; then
 else
 	AC_MSG_NOTICE([   upekts driver disabled])
 fi
-if test x$enable_upeke2 != xno ; then
-	AC_MSG_NOTICE([** upeke2 driver enabled])
-else
-	AC_MSG_NOTICE([   upeke2 driver disabled (handled by upektc_img driver)])
-fi
 if test x$enable_upektc != xno ; then
 	AC_MSG_NOTICE([** upektc driver enabled])
 else

libfprint/Makefile.am

@@ -2,7 +2,6 @@ lib_LTLIBRARIES = libfprint.la
 noinst_PROGRAMS = fprint-list-udev-rules
 MOSTLYCLEANFILES = $(udev_rules_DATA)
 
-UPEKE2_SRC = drivers/upeke2.c
 UPEKTS_SRC = drivers/upekts.c
 UPEKTC_SRC = drivers/upektc.c drivers/upektc.h
 UPEKSONLY_SRC = drivers/upeksonly.c drivers/upeksonly.h
@@ -25,7 +24,6 @@ VFS0050_SRC = drivers/vfs0050.c drivers/vfs0050.h
 ELAN_SRC = drivers/elan.c drivers/elan.h
 
 EXTRA_DIST = \
-	$(UPEKE2_SRC)		\
 	$(UPEKTS_SRC)		\
 	$(UPEKTC_SRC)		\
 	$(UPEKSONLY_SRC)	\
@@ -112,10 +110,6 @@ $(udev_rules_DATA): fprint-list-udev-rules
 	$(builddir)/fprint-list-udev-rules > $@
 endif
 
-if ENABLE_UPEKE2
-DRIVER_SRC += $(UPEKE2_SRC)
-endif
-
 if ENABLE_UPEKTS
 DRIVER_SRC += $(UPEKTS_SRC)
 endif

libfprint/core.c

@@ -343,9 +343,6 @@ static struct fp_driver * const primitive_drivers[] = {
 #ifdef ENABLE_UPEKTS
 	&upekts_driver,
 #endif
-#ifdef ENABLE_UPEKE2
-    &upeke2_driver,
-#endif
 };
 
 static struct fp_img_driver * const img_drivers[] = {

libfprint/drivers/driver_ids.h

@@ -33,7 +33,7 @@ enum {
 	VFS101_ID	= 10,
 	VFS301_ID	= 11,
 	AES2550_ID	= 12,
-	UPEKE2_ID	= 13,
+	/* UPEKE2_ID = 13 */
 	AES1660_ID	= 14,
 	AES2660_ID	= 15,
 	AES3500_ID	= 16,

libfprint/drivers/upektc_img.c

@@ -671,18 +671,14 @@ static int discover(struct libusb_device_descriptor *dsc, uint32_t *devtype)
 {
 	if (dsc->idProduct == 0x2020 && dsc->bcdDevice == 1)
 		return 1;
-#ifndef ENABLE_UPEKE2
 	if (dsc->idProduct == 0x2016 && dsc->bcdDevice == 2)
 		return 1;
-#endif
 
 	return 0;
 }
 
 static const struct usb_id id_table[] = {
-#ifndef ENABLE_UPEKE2
 	{ .vendor = 0x147e, .product = 0x2016 },
-#endif
 	{ .vendor = 0x147e, .product = 0x2020 },
 	{ 0, 0, 0, },
 };

libfprint/fp_internal.h

@@ -251,9 +251,6 @@ struct fp_img_driver {
 #ifdef ENABLE_UPEKTS
 extern struct fp_driver upekts_driver;
 #endif
-#ifdef ENABLE_UPEKE2
-extern struct fp_driver upeke2_driver;
-#endif
 #ifdef ENABLE_UPEKTC
 extern struct fp_img_driver upektc_driver;
 #endif