From 77defa1d8bb37a1799980e717d4f5519658dd655 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Sat, 15 Sep 2018 01:23:02 +0200 Subject: [PATCH] lib: Remove fpi_dev_get_nr_enroll_stages() It's the same as fp_dev_get_nr_enroll_stages() --- libfprint/core.c | 6 ------ libfprint/drivers/vfs101.c | 2 +- libfprint/drivers_api.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/libfprint/core.c b/libfprint/core.c index 327fc2d..0a650c3 100644 --- a/libfprint/core.c +++ b/libfprint/core.c @@ -534,12 +534,6 @@ fpi_dev_get_usb_dev(struct fp_dev *dev) return dev->udev; } -int -fpi_dev_get_nr_enroll_stages(struct fp_dev *dev) -{ - return dev->nr_enroll_stages; -} - void fpi_dev_set_nr_enroll_stages(struct fp_dev *dev, int nr_enroll_stages) diff --git a/libfprint/drivers/vfs101.c b/libfprint/drivers/vfs101.c index d9e981e..7727b64 100644 --- a/libfprint/drivers/vfs101.c +++ b/libfprint/drivers/vfs101.c @@ -647,7 +647,7 @@ static int action_completed(struct fp_img_dev *dev) struct vfs101_dev *vdev = FP_INSTANCE_DATA(FP_DEV(dev)); if ((fpi_imgdev_get_action(dev) == IMG_ACTION_ENROLL) && - (vdev->enroll_stage < fpi_dev_get_nr_enroll_stages(FP_DEV(dev)))) + (vdev->enroll_stage < fp_dev_get_nr_enroll_stages(FP_DEV(dev)))) /* Enroll not completed, return false */ return FALSE; diff --git a/libfprint/drivers_api.h b/libfprint/drivers_api.h index bad5f51..034c174 100644 --- a/libfprint/drivers_api.h +++ b/libfprint/drivers_api.h @@ -38,7 +38,6 @@ #include "drivers/driver_ids.h" libusb_device_handle *fpi_dev_get_usb_dev(struct fp_dev *dev); -int fpi_dev_get_nr_enroll_stages(struct fp_dev *dev); void fpi_dev_set_nr_enroll_stages(struct fp_dev *dev, int nr_enroll_stages); struct fp_print_data *fpi_dev_get_verify_data(struct fp_dev *dev);