From 55da356b3d74c922ac46cdaf8fbfe67e2c37363d Mon Sep 17 00:00:00 2001 From: Luca Ellero Date: Thu, 10 Jul 2014 11:04:03 +0200 Subject: [PATCH] staging: ced1401: fix ced_type_of_1401() Rename camel case arguments and locals in function ced_type_of_1401() Signed-off-by: Luca Ellero Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ced1401/ced_ioc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index 7e598e2d713f..9ac275ccd31f 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -1123,30 +1123,31 @@ int ced_check_self_test(struct ced_data *ced, TGET_SELFTEST __user *ugst) ****************************************************************************/ int ced_type_of_1401(struct ced_data *ced) { - int iReturn = TYPEUNKNOWN; + int ret = TYPEUNKNOWN; + mutex_lock(&ced->io_mutex); dev_dbg(&ced->interface->dev, "%s\n", __func__); switch (ced->type) { case TYPE1401: - iReturn = U14ERR_STD; + ret = U14ERR_STD; break; /* Handle these types directly */ case TYPEPLUS: - iReturn = U14ERR_PLUS; + ret = U14ERR_PLUS; break; case TYPEU1401: - iReturn = U14ERR_U1401; + ret = U14ERR_U1401; break; default: if ((ced->type >= TYPEPOWER) && (ced->type <= 25)) - iReturn = ced->type + 4; /* We can calculate types */ + ret = ced->type + 4; /* We can calculate types */ else /* for up-coming 1401 designs */ - iReturn = TYPEUNKNOWN; /* Don't know or not there */ + ret = TYPEUNKNOWN; /* Don't know or not there */ } - dev_dbg(&ced->interface->dev, "%s %d\n", __func__, iReturn); + dev_dbg(&ced->interface->dev, "%s %d\n", __func__, ret); mutex_unlock(&ced->io_mutex); - return iReturn; + return ret; } /**************************************************************************** -- 2.34.1