From: Luca Ellero Date: Mon, 30 Jun 2014 09:58:05 +0000 (+0200) Subject: staging: ced1401: rename Stat1401() X-Git-Tag: firefly_0821_release~176^2~3491^2~1214 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1de8f0a972118a0704e8f11a1e676e79e617e175;p=firefly-linux-kernel-4.4.55.git staging: ced1401: rename Stat1401() rename camel case function Stat1401() to ced_stat_1401() 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 94244c47cef5..306213668b53 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -516,7 +516,7 @@ int ced_get_string(DEVICE_EXTENSION *pdx, char __user *pUser, int n) /******************************************************************************* ** Get count of characters in the inout buffer. *******************************************************************************/ -int Stat1401(DEVICE_EXTENSION *pdx) +int ced_stat_1401(DEVICE_EXTENSION *pdx) { int iReturn; mutex_lock(&pdx->io_mutex); /* Protect disconnect from new i/o */ diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index 6977dacaed43..bcb0ce0c6a9b 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -1242,7 +1242,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) return ced_send_char(pdx, (char)ulArg); case _IOC_NR(IOCTL_CED_STAT1401): - return Stat1401(pdx); + return ced_stat_1401(pdx); case _IOC_NR(IOCTL_CED_LINECOUNT): return LineCount(pdx); diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 9c409f3e36f4..707290f68953 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -219,7 +219,7 @@ extern int ced_get_string(DEVICE_EXTENSION *pdx, char __user *pUser, int n); extern int SetTransfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD); extern int UnsetTransfer(DEVICE_EXTENSION *pdx, int nArea); extern int SetEvent(DEVICE_EXTENSION *pdx, struct transfer_event __user *pTE); -extern int Stat1401(DEVICE_EXTENSION *pdx); +extern int ced_stat_1401(DEVICE_EXTENSION *pdx); extern int LineCount(DEVICE_EXTENSION *pdx); extern int GetOutBufSpace(DEVICE_EXTENSION *pdx); extern int GetTransfer(DEVICE_EXTENSION *pdx, TGET_TX_BLOCK __user *pGTB);