From 36f527269b556e7fac8c63f4c714cab962e50605 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 28 Sep 2018 14:26:12 +0200 Subject: [PATCH] Revert "lib: Mark fpi_ssm_get_user_data as deprecated" This reverts commit 1fd82b5162e510f501e9b6aabfe2879e1d26c956. This was causing too many warnings at this stage of porting. We'll add it again when most of the drivers are ported. --- libfprint/fpi-ssm.c | 3 --- libfprint/fpi-ssm.h | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libfprint/fpi-ssm.c b/libfprint/fpi-ssm.c index e970c09..20a5f2f 100644 --- a/libfprint/fpi-ssm.c +++ b/libfprint/fpi-ssm.c @@ -124,9 +124,6 @@ fpi_ssm *fpi_ssm_new(struct fp_dev *dev, * is called. * * Returns: a pointer - * - * Deprecated: Make sure your asynchronous functions pass that - * @user_data along. */ void * fpi_ssm_get_user_data(fpi_ssm *machine) diff --git a/libfprint/fpi-ssm.h b/libfprint/fpi-ssm.h index 200a2ab..709928c 100644 --- a/libfprint/fpi-ssm.h +++ b/libfprint/fpi-ssm.h @@ -28,8 +28,6 @@ #include #include -#include "fprint.h" - /* async drv <--> lib comms */ /** @@ -82,7 +80,7 @@ void fpi_ssm_next_state_timeout_cb(struct fp_dev *dev, void *data); void fpi_ssm_jump_to_state(fpi_ssm *machine, int state); void fpi_ssm_mark_completed(fpi_ssm *machine); void fpi_ssm_mark_failed(fpi_ssm *machine, int error); -void *fpi_ssm_get_user_data(fpi_ssm *machine) LIBFPRINT_DEPRECATED; +void *fpi_ssm_get_user_data(fpi_ssm *machine); int fpi_ssm_get_error(fpi_ssm *machine); int fpi_ssm_get_cur_state(fpi_ssm *machine);