Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 119f4cf0 authored by Luca Ellero's avatar Luca Ellero Committed by Greg Kroah-Hartman
Browse files

staging: ced1401: rename ClearArea() 



rename camel case function ClearArea() to ced_clear_area()

Signed-off-by: default avatarLuca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6e5155d0

drivers/staging/ced1401/ced_ioc.c

+4 −4
Original line number Diff line number Diff line
@@ -579,12 +579,12 @@ int ced_get_out_buf_space(DEVICE_EXTENSION *pdx) 


/****************************************************************************

**

** ClearArea

** ced_clear_area

**

** Clears up a transfer area. This is always called in the context of a user

** request, never from a call-back.

****************************************************************************/

int ClearArea(DEVICE_EXTENSION *pdx, int nArea)

int ced_clear_area(DEVICE_EXTENSION *pdx, int nArea)

{

	int iReturn = U14ERR_NOERROR;
@@ -674,7 +674,7 @@ static int SetArea(DEVICE_EXTENSION *pdx, int nArea, char __user *puBuf, 
	struct page **pPages = NULL;	/*  space for page tables */

	int nPages = 0;		/*  and number of pages */



	int iReturn = ClearArea(pdx, nArea);	/*  see if OK to use this area */

	int iReturn = ced_clear_area(pdx, nArea);	/*  see if OK to use this area */

	if ((iReturn != U14ERR_NOTSET) &&	/*  if not area unused and... */

	    (iReturn != U14ERR_NOERROR))	/*  ...not all OK, then... */

		return iReturn;	/*  ...we cannot use this area */
@@ -766,7 +766,7 @@ int UnsetTransfer(DEVICE_EXTENSION *pdx, int nArea) 
{

	int iReturn;

	mutex_lock(&pdx->io_mutex);

	iReturn = ClearArea(pdx, nArea);

	iReturn = ced_clear_area(pdx, nArea);

	mutex_unlock(&pdx->io_mutex);

	return iReturn;

}

drivers/staging/ced1401/usb1401.c

+1 −1
Original line number Diff line number Diff line
@@ -1492,7 +1492,7 @@ static void ced_disconnect(struct usb_interface *interface) 
	mutex_lock(&pdx->io_mutex);	/*  stop more I/O starting while... */

	ced_draw_down(pdx);	/*  ...wait for then kill any io */

	for (i = 0; i < MAX_TRANSAREAS; ++i) {

		int iErr = ClearArea(pdx, i);	/*  ...release any used memory */

		int iErr = ced_clear_area(pdx, i);	/*  ...release any used memory */

		if (iErr == U14ERR_UNLOCKFAIL)

			dev_err(&pdx->interface->dev, "%s: Area %d was in used\n",

				__func__, i);

drivers/staging/ced1401/usb1401.h

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ extern int ced_read_write_mem(DEVICE_EXTENSION *pdx, bool Read, unsigned short w 
				unsigned int dwOffs, unsigned int dwLen);



/*  in ced_ioc.c */

extern int ClearArea(DEVICE_EXTENSION *pdx, int nArea);

extern int ced_clear_area(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);