Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Monam Agarwal <monamagarwal123@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Monam Agarwal and committed by
Greg Kroah-Hartman
5f3ccfcf 90ae9d44

+21 -23
+4 -4
drivers/staging/ced1401/ced_ioc.c
··· 736 736 ** unset it. Unsetting will fail if the area is booked, and a transfer to that 737 737 ** area is in progress. Otherwise, we will release the area and re-assign it. 738 738 ****************************************************************************/ 739 - int SetTransfer(DEVICE_EXTENSION *pdx, TRANSFERDESC __user *pTD) 739 + int SetTransfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD) 740 740 { 741 741 int iReturn; 742 - TRANSFERDESC td; 742 + struct transfer_area_desc td; 743 743 744 744 if (copy_from_user(&td, pTD, sizeof(td))) 745 745 return -EFAULT; ··· 1318 1318 ** booked and a transfer to that area is in progress. Otherwise, we will 1319 1319 ** release the area and re-assign it. 1320 1320 ****************************************************************************/ 1321 - int SetCircular(DEVICE_EXTENSION *pdx, TRANSFERDESC __user *pTD) 1321 + int SetCircular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD) 1322 1322 { 1323 1323 int iReturn; 1324 1324 bool bToHost; 1325 - TRANSFERDESC td; 1325 + struct transfer_area_desc td; 1326 1326 1327 1327 if (copy_from_user(&td, pTD, sizeof(td))) 1328 1328 return -EFAULT;
+6 -7
drivers/staging/ced1401/ced_ioctl.h
··· 26 26 ** TypeDefs 27 27 *****************************************************************************/ 28 28 29 - typedef struct TransferDesc { 29 + struct transfer_area_desc { 30 30 long long lpvBuff; /* address of transfer area (for 64 or 32 bit) */ 31 31 unsigned int dwLength; /* length of the area */ 32 32 unsigned short wAreaNum; /* number of transfer area to set up */ 33 33 short eSize; /* element size - is tohost flag for circular */ 34 - } TRANSFERDESC; 34 + }; 35 35 36 - typedef TRANSFERDESC *LPTRANSFERDESC; 37 36 38 37 typedef struct TransferEvent { 39 38 unsigned int dwStart; /* offset into the area */ ··· 91 92 #define IOCTL_CED_LINECOUNT _IO(CED_MAGIC_IOC, 7) 92 93 #define IOCTL_CED_GETSTRING(nMax) _IOC(_IOC_READ, CED_MAGIC_IOC, 8, nMax) 93 94 94 - #define IOCTL_CED_SETTRANSFER _IOW(CED_MAGIC_IOC, 11, TRANSFERDESC) 95 + #define IOCTL_CED_SETTRANSFER _IOW(CED_MAGIC_IOC, 11, struct transfer_area_desc) 95 96 #define IOCTL_CED_UNSETTRANSFER _IO(CED_MAGIC_IOC, 12) 96 97 #define IOCTL_CED_SETEVENT _IOW(CED_MAGIC_IOC, 13, TRANSFEREVENT) 97 98 #define IOCTL_CED_GETOUTBUFSPACE _IO(CED_MAGIC_IOC, 14) ··· 117 118 #define IOCTL_CED_DBGGETDATA _IOR(CED_MAGIC_IOC, 39, TDBGBLOCK) 118 119 #define IOCTL_CED_DBGSTOPLOOP _IO(CED_MAGIC_IOC, 40) 119 120 #define IOCTL_CED_FULLRESET _IO(CED_MAGIC_IOC, 41) 120 - #define IOCTL_CED_SETCIRCULAR _IOW(CED_MAGIC_IOC, 42, TRANSFERDESC) 121 + #define IOCTL_CED_SETCIRCULAR _IOW(CED_MAGIC_IOC, 42, struct transfer_area_desc) 121 122 #define IOCTL_CED_GETCIRCBLOCK _IOWR(CED_MAGIC_IOC, 43, TCIRCBLOCK) 122 123 #define IOCTL_CED_FREECIRCBLOCK _IOWR(CED_MAGIC_IOC, 44, TCIRCBLOCK) 123 124 #define IOCTL_CED_WAITEVENT _IO(CED_MAGIC_IOC, 45) ··· 189 190 return ioctl(fh, IOCTL_CED_GETDRIVERREVISION); 190 191 } 191 192 192 - inline int CED_SetTransfer(int fh, TRANSFERDESC *pTD) 193 + inline int CED_SetTransfer(int fh, struct transfer_area_desc *pTD) 193 194 { 194 195 return ioctl(fh, IOCTL_CED_SETTRANSFER, pTD); 195 196 } ··· 290 291 return ioctl(fh, IOCTL_CED_FULLRESET); 291 292 } 292 293 293 - inline int CED_SetCircular(int fh, TRANSFERDESC *pTD) 294 + inline int CED_SetCircular(int fh, struct transfer_area_desc *pTD) 294 295 { 295 296 return ioctl(fh, IOCTL_CED_SETCIRCULAR, pTD); 296 297 }
+2 -2
drivers/staging/ced1401/usb1401.c
··· 1251 1251 return GetString(pdx, (char __user *)ulArg, _IOC_SIZE(cmd)); 1252 1252 1253 1253 case _IOC_NR(IOCTL_CED_SETTRANSFER): 1254 - return SetTransfer(pdx, (TRANSFERDESC __user *) ulArg); 1254 + return SetTransfer(pdx, (struct transfer_area_desc __user *) ulArg); 1255 1255 1256 1256 case _IOC_NR(IOCTL_CED_UNSETTRANSFER): 1257 1257 return UnsetTransfer(pdx, (int)ulArg); ··· 1316 1316 break; 1317 1317 1318 1318 case _IOC_NR(IOCTL_CED_SETCIRCULAR): 1319 - return SetCircular(pdx, (TRANSFERDESC __user *) ulArg); 1319 + return SetCircular(pdx, (struct transfer_area_desc __user *) ulArg); 1320 1320 1321 1321 case _IOC_NR(IOCTL_CED_GETCIRCBLOCK): 1322 1322 return GetCircBlock(pdx, (TCIRCBLOCK __user *) ulArg);
+2 -2
drivers/staging/ced1401/usb1401.h
··· 218 218 extern int Reset1401(DEVICE_EXTENSION *pdx); 219 219 extern int GetChar(DEVICE_EXTENSION *pdx); 220 220 extern int GetString(DEVICE_EXTENSION *pdx, char __user *pUser, int n); 221 - extern int SetTransfer(DEVICE_EXTENSION *pdx, TRANSFERDESC __user *pTD); 221 + extern int SetTransfer(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD); 222 222 extern int UnsetTransfer(DEVICE_EXTENSION *pdx, int nArea); 223 223 extern int SetEvent(DEVICE_EXTENSION *pdx, TRANSFEREVENT __user *pTE); 224 224 extern int Stat1401(DEVICE_EXTENSION *pdx); ··· 238 238 extern int DbgRampAddr(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB); 239 239 extern int DbgGetData(DEVICE_EXTENSION *pdx, TDBGBLOCK __user *pDB); 240 240 extern int DbgStopLoop(DEVICE_EXTENSION *pdx); 241 - extern int SetCircular(DEVICE_EXTENSION *pdx, TRANSFERDESC __user *pTD); 241 + extern int SetCircular(DEVICE_EXTENSION *pdx, struct transfer_area_desc __user *pTD); 242 242 extern int GetCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB); 243 243 extern int FreeCircBlock(DEVICE_EXTENSION *pdx, TCIRCBLOCK __user *pCB); 244 244 extern int WaitEvent(DEVICE_EXTENSION *pdx, int nArea, int msTimeOut);
+2 -3
drivers/staging/ced1401/use14_ioc.h
··· 276 276 277 277 typedef PARAMBLK* PPARAMBLK; 278 278 279 - typedef struct TransferDesc /* Structure and type for SetTransArea */ 279 + struct transfer_area_desc /* Structure and type for SetTransArea */ 280 280 { 281 281 unsigned short wArea; /* number of transfer area to set up */ 282 282 void FAR *lpvBuff; /* address of transfer area */ 283 283 unsigned int dwLength; /* length of area to set up */ 284 284 short eSize; /* size to move (for swapping on MAC) */ 285 - } TRANSFERDESC; 285 + }; 286 286 287 - typedef TRANSFERDESC FAR *LPTRANSFERDESC; 288 287 289 288 /* This is the structure used to set up a transfer area */ 290 289 typedef struct VXTransferDesc /* use1401.c and use1432x.x use only */
+5 -5
drivers/staging/ced1401/userspace/use1401.c
··· 2231 2231 U14API(short) U14SetTransArea(short hand, unsigned short wArea, void *pvBuff, 2232 2232 unsigned int dwLength, short eSz) 2233 2233 { 2234 - TRANSFERDESC td; 2234 + struct transfer_area_desc td; 2235 2235 short sErr = CheckHandle(hand); 2236 2236 if (sErr != U14ERR_NOERROR) 2237 2237 return sErr; ··· 2292 2292 td.eSize = 0; // Dummy element size 2293 2293 2294 2294 if (DeviceIoControl(aHand1401[hand],(unsigned int)U14_SETTRANSFER, 2295 - &td,sizeof(TRANSFERDESC), 2295 + &td,sizeof(struct transfer_area_desc), 2296 2296 &rWork,sizeof(PARAMBLK),&dwBytes,NULL)) 2297 2297 { 2298 2298 if (dwBytes >= sizeof(PARAMBLK)) // maybe error from driver? ··· 2496 2496 { 2497 2497 PARAMBLK rWork; 2498 2498 unsigned int dwBytes; 2499 - TRANSFERDESC txDesc; 2499 + struct transfer_area_desc txDesc; 2500 2500 txDesc.wArea = wArea; /* Pure NT - put data into struct */ 2501 2501 txDesc.lpvBuff = pvBuff; 2502 2502 txDesc.dwLength = dwLength; 2503 2503 txDesc.eSize = (short)bToHost; /* Use this for direction flag */ 2504 2504 2505 2505 if (DeviceIoControl(aHand1401[hand],(unsigned int)U14_SETCIRCULAR, 2506 - &txDesc, sizeof(TRANSFERDESC), 2506 + &txDesc, sizeof(struct transfer_area_desc), 2507 2507 &rWork, sizeof(PARAMBLK),&dwBytes,NULL)) 2508 2508 { 2509 2509 if (dwBytes >= sizeof(PARAMBLK)) /* error from driver? */ ··· 2528 2528 #ifdef LINUX 2529 2529 else 2530 2530 { 2531 - TRANSFERDESC td; 2531 + struct transfer_area_desc td; 2532 2532 td.lpvBuff = (long long)((unsigned long)pvBuff); 2533 2533 td.wAreaNum = wArea; 2534 2534 td.dwLength = dwLength;