From a5830de9bd19af55051df1ea1d4824a6e821c47f Mon Sep 17 00:00:00 2001 From: Luca Ellero Date: Mon, 30 Jun 2014 11:57:58 +0200 Subject: [PATCH] staging: ced1401: rename ReadWrite_Cancel() rename camel case function ReadWrite_Cancel() to ced_read_write_cancel() Signed-off-by: Luca Ellero Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ced1401/ced_ioc.c | 10 +++++----- drivers/staging/ced1401/usb1401.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index d9410816e6c5..6faf1dc9fd74 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -214,11 +214,11 @@ int ced_get_state(DEVICE_EXTENSION *pdx, __u32 *state, __u32 *error) } /**************************************************************************** -** ReadWrite_Cancel +** ced_read_write_cancel ** ** Kills off staged read\write request from the USB if one is pending. ****************************************************************************/ -int ReadWrite_Cancel(DEVICE_EXTENSION *pdx) +int ced_read_write_cancel(DEVICE_EXTENSION *pdx) { dev_dbg(&pdx->interface->dev, "%s: entry %d\n", __func__, pdx->bStagedUrbPending); @@ -231,7 +231,7 @@ int ReadWrite_Cancel(DEVICE_EXTENSION *pdx) if (pdx->bStagedUrbPending) { /* anything to be cancelled? May need more... */ dev_info(&pdx->interface - dev, - "ReadWrite_Cancel about to cancel Urb\n"); + "ced_read_write_cancel about to cancel Urb\n"); /* Clear the staging done flag */ /* KeClearEvent(&pdx->StagingDoneEvent); */ USB_ASSERT(pdx->pStagedIrp != NULL); @@ -255,7 +255,7 @@ int ReadWrite_Cancel(DEVICE_EXTENSION *pdx) ntStatus = U14ERR_FAIL; } USB_KdPrint(DBGLVL_DEFAULT, - ("ReadWrite_Cancel ntStatus = 0x%x decimal %d\n", + ("ced_read_write_cancel ntStatus = 0x%x decimal %d\n", ntStatus, ntStatus)); } else spin_unlock_irq(&pdx->stagedLock); @@ -978,7 +978,7 @@ int StartSelfTest(DEVICE_EXTENSION *pdx) ced_flush_in_buff(pdx); /* Clear out input buffer & pipe */ ced_flush_out_buff(pdx); /* Clear output buffer & pipe */ /* so things stay tidy */ - /* ReadWrite_Cancel(pDeviceObject); */ + /* ced_read_write_cancel(pDeviceObject); */ pdx->dwDMAFlag = MODE_CHAR; /* Clear DMA mode flags here */ nGot = usb_control_msg(pdx->udev, usb_rcvctrlpipe(pdx->udev, 0), diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 3bf8783eee43..7b541e9dce67 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -212,7 +212,7 @@ extern int ClearArea(DEVICE_EXTENSION *pdx, int nArea); extern int ced_send_string(DEVICE_EXTENSION *pdx, const char __user *pData, unsigned int n); extern int ced_send_char(DEVICE_EXTENSION *pdx, char c); extern int ced_get_state(DEVICE_EXTENSION *pdx, __u32 *state, __u32 *error); -extern int ReadWrite_Cancel(DEVICE_EXTENSION *pdx); +extern int ced_read_write_cancel(DEVICE_EXTENSION *pdx); extern bool Is1401(DEVICE_EXTENSION *pdx); extern bool QuickCheck(DEVICE_EXTENSION *pdx, bool bTestBuff, bool bCanReset); extern int Reset1401(DEVICE_EXTENSION *pdx); -- 2.11.0