Commit Graph

300 Commits

Author SHA1 Message Date
Kevin McKinney
4f29ef0508 Staging: bcm: Add two products and remove an existing product.
This patch adds two new products and modifies
the device id table to include them. In addition,
product of 0xbccd - BCM_USB_PRODUCT_ID_SM250 is
removed because Beceem, ZTE, Sprint use this id
for block devices.

Reported-by: Muhammad Minhazul Haque <mdminhazulhaque@gmail.com>
Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-13 12:38:29 -08:00
Kevin McKinney
38d6d8de76 Staging: bcm: Change ULONG to unsigned long in InterfaceAdapter.h
This patch changes ULONG to unsigned long
in InterfaceAdapter.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:47 -07:00
Kevin McKinney
85b331afb2 Staging: bcm: Remove typedef for _BULK_ENDP_IN and call directly.
This patch removes typedef for
_BULK_ENDP_IN, changes the name of the
struct to bcm_bulk_endpoint_in. In addition,
any calls to typedefs BULK_ENDP_IN, or
*PBULK_ENDP_IN are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:47 -07:00
Kevin McKinney
c1fa1eb38f Staging: bcm: Remove typedef for _BULK_ENDP_OUT and call directly.
This patch removes typedef for
_BULK_ENDP_OUT, changes the name of the
struct to bcm_bulk_endpoint_out. In addition,
any calls to typedefs BULK_ENDP_OUT, or
*PBULK_ENDP_OUT are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:47 -07:00
Kevin McKinney
89a02bfe0f Staging: bcm: Remove typedef for _INTR_ENDP_IN and call directly.
This patch removes typedef for
_INTR_ENDP_IN, changes the name of the
struct to bcm_intr_endpoint_in. In addition,
any calls to typedefs INTR_ENDP_IN, or
*PINTR_ENDP_IN are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:47 -07:00
Kevin McKinney
de89ec4556 Staging: bcm: Remove typedef for _INTR_ENDP_OUT and call directly.
This patch removes typedef for
_INTR_ENDP_OUT, changes the name of the
struct to bcm_intr_endpoint_out. In addition,
any calls to typedefs INTR_ENDP_OUT, or
*PINTR_ENDP_OUT are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:46 -07:00
Kevin McKinney
e8355aa36c Staging: bcm: Remove typedef for _USB_TCB and call directly.
This patch removes typedef for
_USB_TCB, changes the name of the
struct to bcm_usb_tcb. In addition,
any calls to typedefs USB_TCB, or
*PUSB_TCB are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:46 -07:00
Kevin McKinney
71dd092f36 Staging: bcm: Remove typedef for _USB_RCB and call directly.
This patch removes typedef for
_USB_RCB, changes the name of the
struct to bcm_usb_rcb. In addition,
any calls to typedefs USB_RCB, or
*PUSB_RCB are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:46 -07:00
Kevin McKinney
d6861cfef2 Staging: bcm: Remove typedef for _S_INTERFACE_ADAPTER and call directly.
This patch removes typedef for
_S_INTERFACE_ADAPTER, changes the
name of the struct to bcm_interface_adapter.
In addition, any calls to typedefs
S_INTERFACE_ADAPTER, or *PS_INTERFACE_ADAPTER
are changed to call the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:46 -07:00
Kevin McKinney
48df0187d4 Staging: bcm: Change BOOLEAN to bool in InterfaceAdapter.h
This patch changes BOOLEAN to bool
in InterfaceAdapter.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:46 -07:00
Kevin McKinney
60896e6b81 Staging: bcm: Change PVOID to void * in InterfaceAdapter.h
This patch changes PVOID to void *
in InterfaceAdapter.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:46 -07:00
Kevin McKinney
decb16b317 Staging: bcm: Change UINT to unsigned int in InterfaceAdapter.h
This patch changes UINT to unsigned int
in InterfaceAdapter.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:46 -07:00
Kevin McKinney
d231be5751 Staging: bcm: Change UCHAR to unsigned char in InterfaceAdapter.h
This patch changes UCHAR to unsigned char
in InterfaceAdapter.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:46 -07:00
Kevin McKinney
5806627215 Staging: bcm: Change PCHAR to char * in InterfaceAdapter.h
This patch changes PCHAR to char *
in InterfaceAdapter.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:45 -07:00
Kevin McKinney
5e1db5adb4 Staging: bcm: Correctly format braces in InterfaceAdapter.h
This patch correctly formats braces
in InterfaceAdapter.h as reported by checkpatch.pl.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:45 -07:00
Kevin McKinney
d0d634d31a Staging: bcm: Correctly format comments in InterfaceAdapter.h
This patch correctly formats comments
in InterfaceAdapter.h as reported by checkpatch.pl.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:45 -07:00
Kevin McKinney
5c032faa82 Staging: bcm: Fix all white space issues in InterfaceAdapter.h
This patch fixes all white space issues
in InterfaceAdapter.h as reported by checkpatch.pl.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02 11:36:45 -07:00
Kevin McKinney
e446f5a854 Staging: bcm: Remove typedef stLocalSFAddRequestAlt.
This patch removes typedef
stLocalSFAddRequestAlt in CmHost.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 19:44:48 -07:00
Kevin McKinney
7fac0c47ed Staging: bcm: Remove typedef for stLocalSFAddIndicationAlt and call directly.
This patch removes typedef for
stLocalSFAddIndicationAlt, changes the
name of the struct to bcm_add_indication_alt,
and removes a comment. In addition, any
calls to typedef stLocalSFAddIndicationAlt
are changed to call the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 19:44:48 -07:00
Kevin McKinney
a0e9ad31d4 Staging: bcm: Remove typedef stLocalSFAddConfirmationAlt.
This patch removes typedef
stLocalSFAddConfirmationAlt in CmHost.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 10:37:16 -07:00
Kevin McKinney
a202040a81 Staging: bcm: Remove typedef stLocalSFChangeRequestAlt.
This patch removes typedef
stLocalSFChangeRequestAlt in CmHost.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 10:36:55 -07:00
Kevin McKinney
611c53f3b1 Staging: bcm: Remove typedef stLocalSFChangeConfirmationAlt.
This patch removes typedef
stLocalSFChangeConfirmationAlt
in CmHost.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 10:36:24 -07:00
Kevin McKinney
497f1d5c5e Staging: bcm: Remove typedef for stLocalSFChangeIndicationAlt and call directly.
This patch removes typedef for
stLocalSFChangeIndicationAlt, changes the
name of the struct to bcm_change_indication,
and removes a comment. In addition, any
calls to typedef stLocalSFChangeIndicationAlt
are changed to call the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 10:36:24 -07:00
Kevin McKinney
b7945344bd Staging: bcm: Change PVOID to void * in CmHost.h
This patch changes PVOID to void *
in CmHost.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 10:35:39 -07:00
Kevin McKinney
9e90bc86d5 Staging: bcm: Change UINT to unsigned int in CmHost.h
This patch changes UINT to unsigned
int in CmHost.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 10:35:39 -07:00
Kevin McKinney
617849119a Staging: bcm: Change ULONG to unsigned long in CmHost.h
This patch changes ULONG to unsigned
long in CmHost.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 10:35:39 -07:00
Kevin McKinney
049e52c188 Staging: bcm: Change INT to int in CmHost.h
This patch changes INT to int
in CmHost.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 10:35:39 -07:00
Kevin McKinney
264af7ec63 Staging: bcm: Change B_UINT8 to u8 in CmHost.h
This patch changes B_UINT8 to u8
in CmHost.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 10:35:39 -07:00
Kevin McKinney
64d74ab608 Staging: bcm: Change B_UINT16 to u16 in CmHost.h
This patch changes B_UINT16 to u16
in CmHost.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 10:35:39 -07:00
Kevin McKinney
feec3d78d1 Staging: bcm: Fix all white space issues in CmHost.h
This patch fixes all white space issues
in CmHost.h as reported by checkpatch.pl.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 10:35:39 -07:00
Kevin McKinney
ac56d89ace Staging: bcm: Correctly format comments in CmHost.h
This patch correctly formats comments
in CmHost.h as reported by checkpatch.pl.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-30 10:35:38 -07:00
Kevin McKinney
d6c31c1261 Staging: bcm: Change B_UINT8 to u8 in cntrl_SignalingInterface.h
This patch changes B_UINT8 to u8
in cntrl_SignalingInterface.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-29 17:07:57 -07:00
Kevin McKinney
662e2840c8 Staging: bcm: Change B_UINT16 to u16 in cntrl_SignalingInterface.h
This patch changes B_UINT16 to u16
in cntrl_SignalingInterface.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-29 17:07:57 -07:00
Kevin McKinney
106b0b4c40 Staging: bcm: Change B_UINT32 to u32 cntrl_SignalingInterface.h
This patch changes B_UINT32 to u32 in
cntrl_SignalingInterface.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-29 17:07:56 -07:00
Ceri James
05b3719640 Staging: bcm: InterfaceIdleMode.h: Checkpatch fixes
This fixes the following checkpatch issues:

WARNING: line over 80 characters
+INT InterfaceIdleModeRespond(struct bcm_mini_adapter *Adapter, unsigned int *puiBuffer);

ERROR: "foo * bar" should be "foo *bar"
+INT InterfaceWakeUp(struct bcm_mini_adapter * Adapter);

Signed-off-by: Ceri James <jamesceri@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-23 20:28:19 -07:00
Ceri James
89babccccb Staging: bcm: LeakyBucket.c: Checkpatch fixes
This fixes the following checkpatch issues:

WARNING: line over 80 characters
+	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "=====>\n");

ERROR: space required after that ',' (ctx:VxV)
+	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "=====>\n");
 	                       ^
WARNING: line over 80 characters
+		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "Adapter found NULL!\n");

ERROR: space required after that ',' (ctx:VxV)
+		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "Adapter found NULL!\n");
 		                       ^

Signed-off-by: Ceri James <jamesceri@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-23 20:28:19 -07:00
Kevin McKinney
b64c846285 Staging: bcm: Reverse condition in if statement in Misc.c
This patch reverses the condition in two if
statements in CopyBufferToControlPacket to
place Adapter->bShutStatus and
Adapter->idleMode to the left of the equal
"==" sign, and TRUE to the right of
the equal "==" sign. This was done for
readability purposes.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:43:26 -07:00
Kevin McKinney
895b1fb81c Staging: bcm: Clean up function CopyBufferToControlPacket in Misc.c
This patch cleans up the code in function
CopyBufferToControlPacket. Several things are
being done here: (1) remove the null
initialization from variable cntrl_buff, (2)
reverse the if statement to check if cntrl_buff
is null; if so, then write debug statement and
return -ENOMEM error code, and (3) indent the
code properly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:43:26 -07:00
Kevin McKinney
7af1413446 Staging: bcm: Rename INT to "int" in Misc.c
This patch renames uppercase INT to
"int" in Misc.c, and removes one
white space issue.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:43:26 -07:00
Kevin McKinney
9ef0760fce Staging: bcm: Rename UINT to "unsigned int" in Misc.c
This patch renames uppercase UINT to
"unsigned int" in Misc.c.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:43:25 -07:00
Kevin McKinney
7052208bf5 Staging: bcm: Rename B_UINT32 to "unsigned int" in Misc.c
This patch renames uppercase B_UINT32 to
"unsigned int" in Misc.c.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:43:25 -07:00
Kevin McKinney
4216faf7cb Staging: bcm: Rename B_UINT8 to "unsigned char" in Misc.c
This patch renames uppercase B_UINT8 to
"unsigned char" in Misc.c.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:43:25 -07:00
Kevin McKinney
b23f7f6f57 Staging: bcm: Rename PUINT to "unsigned int *" in Misc.c
This patch renames uppercase PUINT to
"unsigned int *" in Misc.c.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:43:25 -07:00
Kevin McKinney
7a15b79bdb Staging: bcm: Rename VOID to void in Misc.c
This patch renames uppercase VOID to
void in Misc.c.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:43:25 -07:00
Kevin McKinney
fe671fefeb Staging: bcm: Rename PVOID to "void *" in Misc.c
This patch renames uppercase PVOID to
"void *" in Misc.c.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:43:24 -07:00
Kevin McKinney
2807dbe1ce Staging: bcm: Remove null dereference from InterfaceWRM.
This patch removes a potential null dereference
from InterfaceMisc.c, function InterfaceWRM. This
error was reported by Smatch.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:42:24 -07:00
Kevin McKinney
68f7457d06 Staging: bcm: Remove null dereference from InterfaceRDM.
This patch removes a potential null dereference
from InterfaceMisc.c, function InterfaceRDM. This
error was reported by Smatch.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:42:23 -07:00
Kevin McKinney
1e2731eb50 Staging: bcm: Remove unneeded do while loop in InterfaceWRM.
This patch removes an unneeded do while loop which
sends a control message to bcm usb device. In this case,
the loop executes once because usRetries is
initialized to zero. After the first iteration
this variable will be 1. Therefore, the statement:
"usRetries < MAX_RDM_WRM_RETIRES" will evaluate to
false causing the do while statement to execute
once because MAX_RDM_WRM_RETIRES is equal to 1.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:42:23 -07:00
Kevin McKinney
7878626e14 Staging: bcm: Remove unneeded do while loop in InterfaceRDM.
This patch removes an unneeded do while loop which
sends a control message to bcm usb device. In this case,
the loop executes once because usRetries is
initialized to zero. After the first iteration
this variable will be 1. Therefore, the statement:
"usRetries < MAX_RDM_WRM_RETIRES" will evaluate to
false causing the do while statement to execute
once because MAX_RDM_WRM_RETIRES is equal to 1.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:42:23 -07:00
Kevin McKinney
f637035c68 Staging: bcm: Rename VOID to void in InterfaceMisc.c
This patch renames uppercase VOID to
void in InterfaceMisc.c.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-19 13:42:23 -07:00