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

Commit 5f3ccfcf authored by Monam Agarwal's avatar Monam Agarwal Committed by Greg Kroah-Hartman
Browse files

Staging: ced1401: Fix typedef warnings in ced_ioctl.h 



This patch fixes following checkpatch.pl warnings:
WARNING:do not add new typedefs.
In this patch i have also renamed TransferDesc to transfer_area_desc in order to clearly indicate
that it describes the transfer area.

Signed-off-by: default avatarMonam Agarwal <monamagarwal123@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 90ae9d44

drivers/staging/ced1401/ced_ioc.c

+4 −4
Original line number Diff line number Diff line
@@ -736,10 +736,10 @@ error: 
** unset it. Unsetting will fail if the area is booked, and a transfer to that

** area is in progress. Otherwise, we will release the area and re-assign it.

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

int SetTransfer(DEVICE_EXTENSION *pdx, TRANSFERDESC __user *pTD)

int SetTransfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD)

{

	int iReturn;

	TRANSFERDESC td;

	struct transfer_area_desc td;



	if (copy_from_user(&td, pTD, sizeof(td)))

		return -EFAULT;
@@ -1318,11 +1318,11 @@ int DbgStopLoop(DEVICE_EXTENSION *pdx) 
** booked and a transfer to that area is in progress. Otherwise, we will

** release the area and re-assign it.

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

int SetCircular(DEVICE_EXTENSION *pdx, TRANSFERDESC __user *pTD)

int SetCircular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD)

{

	int iReturn;

	bool bToHost;

	TRANSFERDESC td;

	struct transfer_area_desc td;



	if (copy_from_user(&td, pTD, sizeof(td)))

		return -EFAULT;

drivers/staging/ced1401/ced_ioctl.h

+6 −7
Original line number Diff line number Diff line
@@ -26,14 +26,13 @@ 
** TypeDefs

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



typedef struct TransferDesc {

struct transfer_area_desc {

	long long lpvBuff;	/* address of transfer area (for 64 or 32 bit) */

	unsigned int dwLength;	/* length of the area */

	unsigned short wAreaNum;	/* number of transfer area to set up */

	short eSize;		/* element size - is tohost flag for circular */

} TRANSFERDESC;

};



typedef TRANSFERDESC *LPTRANSFERDESC;



typedef struct TransferEvent {

	unsigned int dwStart;		/* offset into the area */
@@ -92,7 +91,7 @@ typedef struct TCSBlock { 
#define IOCTL_CED_LINECOUNT		_IO(CED_MAGIC_IOC, 7)

#define IOCTL_CED_GETSTRING(nMax)	_IOC(_IOC_READ, CED_MAGIC_IOC, 8, nMax)



#define IOCTL_CED_SETTRANSFER		_IOW(CED_MAGIC_IOC, 11, TRANSFERDESC)

#define IOCTL_CED_SETTRANSFER		_IOW(CED_MAGIC_IOC, 11, struct transfer_area_desc)

#define IOCTL_CED_UNSETTRANSFER		_IO(CED_MAGIC_IOC, 12)

#define IOCTL_CED_SETEVENT		_IOW(CED_MAGIC_IOC, 13, TRANSFEREVENT)

#define IOCTL_CED_GETOUTBUFSPACE	_IO(CED_MAGIC_IOC, 14)
@@ -118,7 +117,7 @@ typedef struct TCSBlock { 
#define IOCTL_CED_DBGGETDATA		_IOR(CED_MAGIC_IOC, 39, TDBGBLOCK)

#define IOCTL_CED_DBGSTOPLOOP		_IO(CED_MAGIC_IOC, 40)

#define IOCTL_CED_FULLRESET		_IO(CED_MAGIC_IOC, 41)

#define IOCTL_CED_SETCIRCULAR		_IOW(CED_MAGIC_IOC, 42, TRANSFERDESC)

#define IOCTL_CED_SETCIRCULAR		_IOW(CED_MAGIC_IOC, 42, struct transfer_area_desc)

#define IOCTL_CED_GETCIRCBLOCK		_IOWR(CED_MAGIC_IOC, 43, TCIRCBLOCK)

#define IOCTL_CED_FREECIRCBLOCK		_IOWR(CED_MAGIC_IOC, 44, TCIRCBLOCK)

#define IOCTL_CED_WAITEVENT		_IO(CED_MAGIC_IOC, 45)
@@ -190,7 +189,7 @@ inline int CED_GetDriverRevision(int fh) 
	return ioctl(fh, IOCTL_CED_GETDRIVERREVISION);

}



inline int CED_SetTransfer(int fh, TRANSFERDESC *pTD)

inline int CED_SetTransfer(int fh, struct transfer_area_desc *pTD)

{

	return ioctl(fh, IOCTL_CED_SETTRANSFER, pTD);

}
@@ -291,7 +290,7 @@ inline int CED_FullReset(int fh) 
	return ioctl(fh, IOCTL_CED_FULLRESET);

}



inline int CED_SetCircular(int fh, TRANSFERDESC *pTD)

inline int CED_SetCircular(int fh, struct transfer_area_desc *pTD)

{

	return ioctl(fh, IOCTL_CED_SETCIRCULAR, pTD);

}

drivers/staging/ced1401/usb1401.c

+2 −2
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) 
		return GetString(pdx, (char __user *)ulArg, _IOC_SIZE(cmd));



	case _IOC_NR(IOCTL_CED_SETTRANSFER):

		return SetTransfer(pdx, (TRANSFERDESC __user *) ulArg);

		return SetTransfer(pdx, (struct transfer_area_desc __user *) ulArg);



	case _IOC_NR(IOCTL_CED_UNSETTRANSFER):

		return UnsetTransfer(pdx, (int)ulArg);
@@ -1316,7 +1316,7 @@ static long ced_ioctl(struct file *file, unsigned int cmd, unsigned long ulArg) 
		break;



	case _IOC_NR(IOCTL_CED_SETCIRCULAR):

		return SetCircular(pdx, (TRANSFERDESC __user *) ulArg);

		return SetCircular(pdx, (struct transfer_area_desc __user *) ulArg);



	case _IOC_NR(IOCTL_CED_GETCIRCBLOCK):

		return GetCircBlock(pdx, (TCIRCBLOCK __user *) ulArg);

drivers/staging/ced1401/usb1401.h

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ extern bool QuickCheck(DEVICE_EXTENSION *pdx, bool bTestBuff, bool bCanReset); 
extern int Reset1401(DEVICE_EXTENSION *pdx);

extern int GetChar(DEVICE_EXTENSION *pdx);

extern int GetString(DEVICE_EXTENSION *pdx, char __user *pUser, int n);

extern int SetTransfer(DEVICE_EXTENSION *pdx, TRANSFERDESC __user *pTD);

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, TRANSFEREVENT __user *pTE);

extern int Stat1401(DEVICE_EXTENSION *pdx);
@@ -238,7 +238,7 @@ extern int DbgRampData(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB); 
extern int DbgRampAddr(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB);

extern int DbgGetData(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB);

extern int DbgStopLoop(DEVICE_EXTENSION *pdx);

extern int SetCircular(DEVICE_EXTENSION *pdx, TRANSFERDESC __user *pTD);

extern int SetCircular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD);

extern int GetCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB);

extern int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB);

extern int WaitEvent(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut);

drivers/staging/ced1401/use14_ioc.h

+2 −3
Original line number Diff line number Diff line
@@ -276,15 +276,14 @@ typedef struct paramBlk { 


typedef PARAMBLK*   PPARAMBLK;



typedef struct TransferDesc          /* Structure and type for SetTransArea */

struct transfer_area_desc          /* Structure and type for SetTransArea */

{

	unsigned short        wArea;            /* number of transfer area to set up       */

	void FAR *lpvBuff;          /* address of transfer area                */

	unsigned int       dwLength;         /* length of area to set up                */

	short       eSize;            /* size to move (for swapping on MAC)      */

} TRANSFERDESC;

};



typedef TRANSFERDESC FAR *LPTRANSFERDESC;



/* This is the structure used to set up a transfer area */

typedef struct VXTransferDesc    /* use1401.c and use1432x.x use only       */