firmware: google: fix gsmi.c build warning
Maxin B. John [Wed, 30 Nov 2011 23:37:33 +0000 (01:37 +0200)]
Use min_t() macro instead of min() to fix a build warning:

CC drivers/firmware/google/gsmi.o
drivers/firmware/google/gsmi.c: In function ‘gsmi_get_variable’:
drivers/firmware/google/gsmi.c:348: warning: comparison of distinct
pointer types lacks a cast

Signed-off-by: Maxin B. John <maxin.john@gmail.com>
Acked-By: Mike Waychison <mikew@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/firmware/google/gsmi.c

index c4e7c59..91ddf0f 100644 (file)
@@ -345,7 +345,8 @@ static efi_status_t gsmi_get_variable(efi_char16_t *name,
                memcpy(&param, gsmi_dev.param_buf->start, sizeof(param));
 
                /* The size reported is the min of all of our buffers */
-               *data_size = min(*data_size, gsmi_dev.data_buf->length);
+               *data_size = min_t(unsigned long, *data_size,
+                                               gsmi_dev.data_buf->length);
                *data_size = min_t(unsigned long, *data_size, param.data_len);
 
                /* Copy data back to return buffer. */