commit 3b9ee8d82f36a93cb499623d0409efebbb6de2bd
author Sasha Levitskiy <sanek@google.com> Wed Apr 23 10:04:57 2014 -0700
committer Sasha Levitskiy <sanek@google.com> Wed Apr 23 10:05:57 2014 -0700
tree 733036737e5f2e249d9ca9d49875f0b576826926
parent 449ebdd70fa8df58b03a9bd38deed2e53cb512a0

Hardware: Fingerprint: Fix the remove() argument, typos.

Change-Id: I99e8e2f24f0264c2217d67a75fe437756596053c
Signed-off-by: Sasha Levitskiy <sanek@google.com>

include/hardware/fingerprint.h

diff --git a/include/hardware/fingerprint.h b/include/hardware/fingerprint.h
index acd96e2..c7497ea 100644
--- a/include/hardware/fingerprint.h
+++ b/include/hardware/fingerprint.h
@@ -35,11 +35,11 @@
 
 typedef struct fingerprint_enroll {
     uint32_t id;
-    /* samples_remaining goes form N (no data collected, but N scans needed)
+    /* samples_remaining goes from N (no data collected, but N scans needed)
      * to 0 (no more data is needed to build a template)
      * If HAL fails to decrement samples_remaining between calls the client
      * will declare template collection a failure and should abort the operation
-     * by calling fingerprint_close() */
+     * by calling module->common.methods->close() */
     uint32_t samples_remaining;
 } fingerprint_enroll_t;
 
@@ -66,20 +66,20 @@
     struct hw_device_t common;
 
     /*
-     * Figerprint enroll request:
+     * Fingerprint enroll request:
      * Switches the HAL state machine to collect and store a new fingerprint
      * template. Switches back as soon as enroll is complete
      * (fingerprint_msg.type == FINGERPRINT_TEMPLATE_COLLECTING &&
      *  fingerprint_msg.data.enroll.samples_remaining == 0)
-     * or after temeout_sec seconds.
+     * or after timeout_sec seconds.
      *
      * Function return: 0 if enrollment process can be successfully started
      *                 -1 otherwise.
      */
-    int (*enroll)(struct fingerprint_device *dev, unsigned timeout_sec);
+    int (*enroll)(struct fingerprint_device *dev, uint32_t timeout_sec);
 
     /*
-     * Figerprint remove request:
+     * Fingerprint remove request:
      * deletes a fingerprint template.
      * If the fingerprint id is 0 the entire template database will be removed.
      *

modules/fingerprint/fingerprint.c

diff --git a/modules/fingerprint/fingerprint.c b/modules/fingerprint/fingerprint.c
index c2ff169..14dac12 100644
--- a/modules/fingerprint/fingerprint.c
+++ b/modules/fingerprint/fingerprint.c
@@ -32,12 +32,12 @@
 }
 
 static int fingerprint_enroll(struct fingerprint_device __unused *dev,
-                                unsigned __unused timeout_sec) {
+                                uint32_t __unused timeout_sec) {
     return FINGERPRINT_ERROR;
 }
 
 static int fingerprint_remove(struct fingerprint_device __unused *dev,
-                                uint16_t __unused fingerprint_id) {
+                                uint32_t __unused fingerprint_id) {
     return FINGERPRINT_ERROR;
 }