Staging: bcm: Fix of various code style issues.
PATCH 1/1 Staging: bcm: Fix of various code style issues.
Changed comment style to C89 in Version.h Fixed some whitespace issues in Typedefs.h Changed comment style to C89 in vendorspecificextn.c All issues found with checkpatch.pl
--- drivers/staging/bcm/Typedefs.h | 22 ++-- drivers/staging/bcm/Version.h | 8 +- drivers/staging/bcm/vendorspecificextn.c | 197 +++++++++++++++--------------- 3 files changed, 110 insertions(+), 117 deletions(-)
drivers/staging/bcm/Typedefs.h +11 -11
@@ -25,16 +25,16 @@ typedef unsigned int B_UINT32;typedef unsigned long ULONG ;typedef unsigned long DWORD ; -typedef char *PCHAR ; -typedef short *PSHORT ; -typedef int *PINT ; -typedef long *PLONG ; -typedef void *PVOID ; - -typedef unsigned char *PUCHAR ; -typedef unsigned short *PUSHORT ; -typedef unsigned int *PUINT ; -typedef unsigned long *PULONG ; +typedef char *PCHAR ; +typedef short *PSHORT ; +typedef int *PINT ; +typedef long *PLONG ; +typedef void *PVOID ; + +typedef unsigned char *PUCHAR ; +typedef unsigned short *PUSHORT ; +typedef unsigned int *PUINT ; +typedef unsigned long *PULONG ;typedef unsigned long long ULONG64 ;typedef unsigned long long LARGE_INTEGER ;typedef unsigned int UINT32 ;
@@ -43,5 +43,5 @@ typedef unsigned int UINT32;#endif -#endif //__TYPEDEFS_H__ +#endif /* __TYPEDEFS_H__ */
drivers/staging/bcm/Version.h +2 -6
@@ -17,7 +17,6 @@ Abstract:#define VER_FILETYPE VFT_DRV#define VER_FILESUBTYPE VFT2_DRV_NETWORK -#define VER_FILEVERSION 5.2.45#define VER_FILEVERSION_STR "5.2.45"
@@ -27,9 +26,6 @@ Abstract:#undef VER_PRODUCTVERSION_STR#define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR +/* #include "common.ver" */ - - -//#include "common.ver" - -#endif //VERSION_H +#endif /* VERSION_H */
drivers/staging/bcm/vendorspecificextn.c +97 -100
234 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Greg Kroah-Hartman
maintainerQuoted 3 lines · Severin Gsponer
Changed comment style to C89 in
Version.hFixed some whitespace issues inTypedefs.hChanged comment style to C89 invendorspecificextn.c
You are doing 3 different things, so this should be at least 3 different patches, right?
Please split them up and resend them, thanks.
greg k-h
Quoted 44 lines · Severin Gsponer
Changed comment style to C89 in
Version.hFixed some whitespace issues inTypedefs.hChanged comment style to C89 invendorspecificextn.cAll issues found with checkpatch.plSigned-off-by Severin Gsponer <[email protected]>--- drivers/staging/bcm/Typedefs.h | 22 ++-- drivers/staging/bcm/Version.h | 8 +- drivers/staging/bcm/vendorspecificextn.c | 197 +++++++++++++++--------------- 3 files changed, 110 insertions(+), 117 deletions(-)drivers/staging/bcm/Typedefs.h +10
-10@@ -25,16 +25,16 @@ typedef unsigned int B_UINT32;typedef unsigned long ULONG ;typedef unsigned long DWORD ; -typedef char *PCHAR ; -typedef short *PSHORT ; -typedef int *PINT ; -typedef long *PLONG ; -typedef void *PVOID ; - -typedef unsigned char *PUCHAR ; -typedef unsigned short *PUSHORT ; -typedef unsigned int *PUINT ; -typedef unsigned long *PULONG ; +typedef char *PCHAR ; +typedef short *PSHORT ; +typedef int *PINT ; +typedef long *PLONG ; +typedef void *PVOID ; + +typedef unsigned char *PUCHAR ; +typedef unsigned short *PUSHORT ; +typedef unsigned int *PUINT ; +typedef unsigned long *PULONG ;typedef unsigned long long ULONG64 ;typedef unsigned long long LARGE_INTEGER ;typedef unsigned int UINT32 ;
drivers/staging/bcm/Typedefs.h typedef unsigned int UINT32; · line 43
Quoted 1 line
drivers/staging/bcm/Typedefs.h +0
-0@@ -43,5 +43,5 @@ typedef unsigned int UINT32;#endif
I bet, there is no reason for such typedef's
Signature · 1 line
Nikola
Quoted 46 lines · Severin Gsponer
Changed comment style to C89 in
Version.hFixed some whitespace issues inTypedefs.hChanged comment style to C89 invendorspecificextn.cAll issues found with checkpatch.plSigned-off-by Severin Gsponer <[email protected]>--- drivers/staging/bcm/Typedefs.h | 22 ++-- drivers/staging/bcm/Version.h | 8 +- drivers/staging/bcm/vendorspecificextn.c | 197 +++++++++++++++--------------- 3 files changed, 110 insertions(+), 117 deletions(-)drivers/staging/bcm/Typedefs.h +10
-10@@ -25,16 +25,16 @@ typedef unsigned int B_UINT32;typedef unsigned long ULONG ;typedef unsigned long DWORD ; -typedef char *PCHAR ; -typedef short *PSHORT ; -typedef int *PINT ; -typedef long *PLONG ; -typedef void *PVOID ; - -typedef unsigned char *PUCHAR ; -typedef unsigned short *PUSHORT ; -typedef unsigned int *PUINT ; -typedef unsigned long *PULONG ; +typedef char *PCHAR ; +typedef short *PSHORT ; +typedef int *PINT ; +typedef long *PLONG ; +typedef void *PVOID ; + +typedef unsigned char *PUCHAR ; +typedef unsigned short *PUSHORT ; +typedef unsigned int *PUINT ; +typedef unsigned long *PULONG ;typedef unsigned long long ULONG64 ;typedef unsigned long long LARGE_INTEGER ;typedef unsigned int UINT32 ;
drivers/staging/bcm/Typedefs.h typedef unsigned int UINT32; · line 43
Quoted 1 line
drivers/staging/bcm/Typedefs.h +0
-0@@ -43,5 +43,5 @@ typedef unsigned int UINT32;#endif
Agreed, please remove all the typedefs completely.
Quoted 17 lines
drivers/staging/bcm/Typedefs.h +1
-1-#endif //__TYPEDEFS_H__ +#endif /* __TYPEDEFS_H__ */ drivers/staging/bcm/Version.h +0
-1@@ -17,7 +17,6 @@ Abstract:#define VER_FILETYPE VFT_DRV#define VER_FILESUBTYPE VFT2_DRV_NETWORK -#define VER_FILEVERSION 5.2.45#define VER_FILEVERSION_STR "5.2.45"
drivers/staging/bcm/Version.h Abstract: · line 29
Quoted 4 lines
drivers/staging/bcm/Version.h +1
-0@@ -27,9 +26,6 @@ Abstract:#undef VER_PRODUCTVERSION_STR#define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR +/* #include "common.ver" */
Drop the whole line here.
Quoted 268 lines
drivers/staging/bcm/Version.h +1
-5- - -//#include "common.ver" - -#endif //VERSION_H +#endif /* VERSION_H */ drivers/staging/bcm/vendorspecificextn.c +24
-28@@ -1,70 +1,70 @@#include "headers.h" -//----------------------------------------------------------------------------- -// Procedure: vendorextnGetSectionInfo -// -// Description: Finds the type of NVM used. -// -// Arguments: -// Adapter - ptr to Adapter object instance -// pNVMType - ptr to NVM type. -// Returns: -// STATUS_SUCCESS/STATUS_FAILURE -// -//----------------------------------------------------------------------------- +/* +* Procedure: vendorextnGetSectionInfo +* +* Description: Finds the type of NVM used. +* +* Arguments: +* Adapter - ptr to Adapter object instance +* pNVMType - ptr to NVM type. +* Returns: +* STATUS_SUCCESS/STATUS_FAILURE +* +*/ INT vendorextnGetSectionInfo (PVOID pContext,struct bcm_flash2x_vendor_info *pVendorInfo) {return STATUS_FAILURE ; } -//----------------------------------------------------------------------------- -// Procedure: vendorextnInit -// -// Description: Initializing the vendor extension NVM interface -// -// Arguments: -// Adapter - Pointer to MINI Adapter Structure. - -// Returns: -// STATUS_SUCCESS/STATUS_FAILURE -// -//----------------------------------------------------------------------------- +/* +* Procedure: vendorextnInit +* +* Description: Initializing the vendor extension NVM interface +* +* Arguments: +* Adapter - Pointer to MINI Adapter Structure +* Returns: +* STATUS_SUCCESS/STATUS_FAILURE +* +* +*/ INT vendorextnInit (struct bcm_mini_adapter *Adapter) {return STATUS_SUCCESS ; } -//----------------------------------------------------------------------------- -// Procedure: vendorextnExit -// -// Description: Free the resource associated with vendor extension NVM interface
drivers/staging/bcm/vendorspecificextn.c +4
-8-// -// Arguments: -// Adapter - Pointer to MINI Adapter Structure. - -// Returns: -// STATUS_SUCCESS/STATUS_FAILURE -// -//----------------------------------------------------------------------------- +/* +* Procedure: vendorextnExit +* +* Description: Free the resource associated with vendor extension NVM interface
+ *
+ * Arguments:
+ *
+ * Returns:
+ * STATUS_SUCCESS/STATUS_FAILURE
+ *
+ *
+ */
INTvendorextnExit(struct bcm_mini_adapter *Adapter){drivers/staging/bcm/vendorspecificextn.c +0
-12return STATUS_SUCCESS ; } -//------------------------------------------------------------------------ -// Procedure: vendorextnIoctl -// -// Description: execute the vendor extension specific ioctl -// -//Arguments: -// Adapter -Beceem private Adapter Structure -// cmd -vendor extension specific Ioctl commad -// arg -input parameter sent by vendor -// -// Returns: -// CONTINUE_COMMON_PATH in case it is not meant to be processed by vendor ioctls
drivers/staging/bcm/vendorspecificextn.c +12
-3-// STATUS_SUCCESS/STATUS_FAILURE as per the IOCTL return value -// -//-------------------------------------------------------------------------- +/* +* Procedure: vendorextnIoctl +* +* Description: execute the vendor extension specific ioctl +* +* Arguments: +* Adapter -Beceem private Adapter Structure +* cmd -vendor extension specific Ioctl commad +* arg -input parameter sent by vendor +* +* Returns: +* CONTINUE_COMMON_PATH in case it is not meant to be processed by vendor ioctls
+ * STATUS_SUCCESS/STATUS_FAILURE as per the IOCTL return value
+ */drivers/staging/bcm/vendorspecificextn.c +16
-16+INT vendorextnIoctl (struct bcm_mini_adapter *Adapter,UINT cmd,ULONG arg) {return CONTINUE_COMMON_PATH ;@@ -72,22 +72,21 @@ INT vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg) -//------------------------------------------------------------------ -// Procedure: vendorextnReadSection -// -// Description: Reads from a section of NVM -// -// Arguments: -// pContext - ptr to Adapter object instance -// pBuffer - Read the data from Vendor Area to this buffer -// SectionVal - Value of type of Section -// Offset - Read from the Offset of the Vendor Section. -// numOfBytes - Read numOfBytes from the Vendor section to Buffer -// -// Returns: -// STATUS_SUCCESS/STATUS_FAILURE -// -//------------------------------------------------------------------ +/* + * Procedure: vendorextnReadSection + * + * Description: Reads from a section of NVM + * + * Arguments: + * pContext - ptr to Adapter object instance + * pBuffer - Read the data from Vendor Area to this buffer + * SectionVal - Value of type of Section + * Offset - Read from the Offset of the Vendor Section. + * numOfBytes - Read numOfBytes from the Vendor section to Buffer + * + * Returns: + * STATUS_SUCCESS/STATUS_FAILURE + */ INT vendorextnReadSection(PVOID pContext, PUCHAR pBuffer, enum
bcm_flash2x_section_valSectionVal,drivers/staging/bcm/vendorspecificextn.c +0
-0UINT offset, UINT numOfBytes)@@ -97,23 +96,22 @@ INT vendorextnReadSection(PVOID pContext, PUCHARpBuffer, enum
bcm_flash2x_sectdrivers/staging/bcm/vendorspecificextn.c +16
-17-//------------------------------------------------------------------ -// Procedure: vendorextnWriteSection -// -// Description: Write to a Section of NVM -// -// Arguments: -// pContext - ptr to Adapter object instance -// pBuffer - Write the data provided in the buffer -// SectionVal - Value of type of Section -// Offset - Writes to the Offset of the Vendor Section. -// numOfBytes - Write num Bytes after reading from pBuffer. -// bVerify - the Buffer Written should be verified. -// -// Returns: -// STATUS_SUCCESS/STATUS_FAILURE -// -//------------------------------------------------------------------ +/* +* Procedure: vendorextnWriteSection +* +* Description: Write to a Section of NVM +* +* Arguments: +* pContext - ptr to Adapter object instance +* pBuffer - Write the data provided in the buffer +* SectionVal - Value of type of Section +* Offset - Writes to the Offset of the Vendor Section. +* numOfBytes - Write num Bytes after reading from pBuffer. +* bVerify - the Buffer Written should be verified. +* +* Returns: +* STATUS_SUCCESS/STATUS_FAILURE +*/ INT vendorextnWriteSection(PVOID pContext, PUCHAR pBuffer, enum
bcm_flash2x_section_valSectionVal,drivers/staging/bcm/vendorspecificextn.c +0
-0UINT offset, UINT numOfBytes, BOOLEAN bVerify) {@@ -122,22 +120,21 @@ INT vendorextnWriteSection(PVOID pContext, PUCHARpBuffer, enum
bcm_flash2x_secdrivers/staging/bcm/vendorspecificextn.c +15
-16-//------------------------------------------------------------------ -// Procedure: vendorextnWriteSectionWithoutErase -// -// Description: Write to a Section of NVM without erasing the sector -// -// Arguments: -// pContext - ptr to Adapter object instance -// pBuffer - Write the data provided in the buffer -// SectionVal - Value of type of Section -// Offset - Writes to the Offset of the Vendor Section. -// numOfBytes - Write num Bytes after reading from pBuffer. -// -// Returns: -// STATUS_SUCCESS/STATUS_FAILURE -// -//------------------------------------------------------------------ +/* +* Procedure: vendorextnWriteSectionWithoutErase +* +* Description: Write to a Section of NVM without erasing the sector +* +* Arguments: +* pContext - ptr to Adapter object instance +* pBuffer - Write the data provided in the buffer +* SectionVal - Value of type of Section +* Offset - Writes to the Offset of the Vendor Section. +* numOfBytes - Write num Bytes after reading from pBuffer. +* +* Returns: +* STATUS_SUCCESS/STATUS_FAILURE +*/ INT vendorextnWriteSectionWithoutErase(PVOID pContext, PUCHAR pBuffer,enum
bcm_flash2x_section_valSectionVal,
UINT offset, UINT numOfBytes)
{
--
1.7.10.4_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
Signature · 2 lines
Regards, Denis