From: Luca Ellero Date: Mon, 30 Jun 2014 09:57:43 +0000 (+0200) Subject: staging: ced1401: rename CopyUserSpace() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=799a9158f4fde61972524cf3a5169a4cc8ad6ae5;p=linux-beck.git staging: ced1401: rename CopyUserSpace() rename camel case function CopyUserSpace() to ced_copy_user_space() Signed-off-by: Luca Ellero Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c index 2ad3560a3128..8897dddbaa4f 100644 --- a/drivers/staging/ced1401/usb1401.c +++ b/drivers/staging/ced1401/usb1401.c @@ -76,7 +76,7 @@ pages that we hold a pointer to in the device driver. We also allocate a coherent transfer buffer of size STAGED_SZ (this must be a multiple of the bulk endpoint size so that the 1401 does not realise that we break large transfers down into smaller pieces). We use kmap_atomic() to get a kernel -va for each page, as it is required, for copying; see CopyUserSpace(). +va for each page, as it is required, for copying; see ced_copy_user_space(). All character and data transfers are done using asynchronous IO. All Urbs are tracked by anchoring them. Status and debug ioctls are implemented with the @@ -424,7 +424,7 @@ int ced_send_chars(DEVICE_EXTENSION *pdx) } /*************************************************************************** -** CopyUserSpace +** ced_copy_user_space ** This moves memory between pinned down user space and the pCoherStagedIO ** memory buffer we use for transfers. Copy n bytes in the directions that ** is defined by pdx->StagedRead. The user space is determined by the area @@ -437,7 +437,7 @@ int ced_send_chars(DEVICE_EXTENSION *pdx) ** pdx Is our device extension which holds all we know about the transfer. ** n The number of bytes to move one way or the other. ***************************************************************************/ -static void CopyUserSpace(DEVICE_EXTENSION *pdx, int n) +static void ced_copy_user_space(DEVICE_EXTENSION *pdx, int n) { unsigned int nArea = pdx->StagedId; if (nArea < MAX_TRANSAREAS) { @@ -528,7 +528,7 @@ static void staged_callback(struct urb *pUrb) dev_dbg(&pdx->interface->dev, "%s: %d chars xferred\n", __func__, nGot); if (pdx->StagedRead) /* if reading, save to user space */ - CopyUserSpace(pdx, nGot); /* copy from buffer to user */ + ced_copy_user_space(pdx, nGot); /* copy from buffer to user */ if (nGot == 0) dev_dbg(&pdx->interface->dev, "%s: ZLP\n", __func__); } @@ -717,7 +717,7 @@ static int StageChunk(DEVICE_EXTENSION *pdx) ChunkSize = STAGED_SZ; /* limit to max allowed */ if (!pdx->StagedRead) /* if writing... */ - CopyUserSpace(pdx, ChunkSize); /* ...copy data into the buffer */ + ced_copy_user_space(pdx, ChunkSize); /* ...copy data into the buffer */ usb_fill_bulk_urb(pdx->pStagedUrb, pdx->udev, pdx->StagedRead ? usb_rcvbulkpipe(pdx->udev,