From: Luca Ellero Date: Thu, 10 Jul 2014 09:02:12 +0000 (+0200) Subject: staging: ced1401: fix ced_in_self_test() X-Git-Tag: v3.17-rc1~123^2~999 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dbbb6ab117472b1f0779664c5e8f2cf4323ce2ce;p=karo-tx-linux.git staging: ced1401: fix ced_in_self_test() Rename camel case arguments and locals in function ced_in_self_test() Signed-off-by: Luca Ellero Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index 8c847ffe6f63..528061bdbc87 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -276,18 +276,18 @@ int ced_read_write_cancel(struct ced_data *ced) } /*************************************************************************** -** ced_in_self_test - utility to check in self test. Return 1 for ST, 0 for not or -** a -ve error code if we failed for some reason. +** ced_in_self_test - utility to check in self test. Return 1 for ST, 0 for not +** or a -ve error code if we failed for some reason. ***************************************************************************/ -static int ced_in_self_test(struct ced_data *ced, unsigned int *pState) +static int ced_in_self_test(struct ced_data *ced, unsigned int *stat) { unsigned int state, error; - int iReturn = ced_get_state(ced, &state, &error); /* see if in self-test */ - if (iReturn == U14ERR_NOERROR) /* if all still OK */ - iReturn = (state == (unsigned int)-1) || /* TX problem or... */ + int ret = ced_get_state(ced, &state, &error); /* see if in self-test */ + if (ret == U14ERR_NOERROR) /* if all still OK */ + ret = (state == (unsigned int)-1) || /* TX problem or... */ ((state & 0xff) == 0x80); /* ...self test */ - *pState = state; /* return actual state */ - return iReturn; + *stat = state; /* return actual state */ + return ret; } /***************************************************************************