From: Luca Ellero Date: Thu, 10 Jul 2014 09:02:15 +0000 (+0200) Subject: staging: ced1401: fix ced_get_char() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=673b2ead7aa9ea043d1fdb9d204191fc6733770b;p=openwrt%2Fstaging%2Fblogic.git staging: ced1401: fix ced_get_char() Rename camel case arguments and locals in function ced_get_char() 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 350c7d64d239..9a19c84704ad 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -436,7 +436,7 @@ int ced_reset(struct ced_data *ced) ****************************************************************************/ int ced_get_char(struct ced_data *ced) { - int iReturn = U14ERR_NOIN; /* assume we will get nothing */ + int ret = U14ERR_NOIN; /* assume we will get nothing */ mutex_lock(&ced->io_mutex); /* Protect disconnect from new i/o */ dev_dbg(&ced->interface->dev, "%s\n", __func__); @@ -446,18 +446,18 @@ int ced_get_char(struct ced_data *ced) spin_lock_irq(&ced->char_in_lock); if (ced->num_input > 0) { /* worth looking */ - iReturn = ced->input_buffer[ced->in_buff_get++]; + ret = ced->input_buffer[ced->in_buff_get++]; if (ced->in_buff_get >= INBUF_SZ) ced->in_buff_get = 0; ced->num_input--; } else - iReturn = U14ERR_NOIN; /* no input data to read */ + ret = U14ERR_NOIN; /* no input data to read */ spin_unlock_irq(&ced->char_in_lock); ced_allowi(ced); /* Make sure char reads are running */ mutex_unlock(&ced->io_mutex); /* Protect disconnect from new i/o */ - return iReturn; + return ret; } /****************************************************************************