summaryrefslogtreecommitdiffstats
path: root/drivers/staging/bcm/InterfaceMisc.c
diff options
context:
space:
mode:
authorKevin McKinney2012-11-02 04:42:21 +0100
committerGreg Kroah-Hartman2012-11-02 19:36:46 +0100
commitd6861cfef2e42fecd5f0d51554493e45df6612a6 (patch)
treefae59eca620530c33b7a8fef489d39b27d047e74 /drivers/staging/bcm/InterfaceMisc.c
parentStaging: bcm: Change BOOLEAN to bool in InterfaceAdapter.h (diff)
downloadkernel-qcow2-linux-d6861cfef2e42fecd5f0d51554493e45df6612a6.tar.gz
kernel-qcow2-linux-d6861cfef2e42fecd5f0d51554493e45df6612a6.tar.xz
kernel-qcow2-linux-d6861cfef2e42fecd5f0d51554493e45df6612a6.zip
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>
Diffstat (limited to 'drivers/staging/bcm/InterfaceMisc.c')
-rw-r--r--drivers/staging/bcm/InterfaceMisc.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c
index 9c832b323837..afca010f9db5 100644
--- a/drivers/staging/bcm/InterfaceMisc.c
+++ b/drivers/staging/bcm/InterfaceMisc.c
@@ -1,6 +1,6 @@
#include "headers.h"
-int InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
+int InterfaceRDM(struct bcm_interface_adapter *psIntfAdapter,
unsigned int addr,
void *buff,
int len)
@@ -48,7 +48,7 @@ int InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
return bytes;
}
-int InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
+int InterfaceWRM(struct bcm_interface_adapter *psIntfAdapter,
unsigned int addr,
void *buff,
int len)
@@ -104,7 +104,7 @@ int BcmRDM(void *arg,
void *buff,
int len)
{
- return InterfaceRDM((PS_INTERFACE_ADAPTER)arg, addr, buff, len);
+ return InterfaceRDM((struct bcm_interface_adapter*)arg, addr, buff, len);
}
int BcmWRM(void *arg,
@@ -112,12 +112,12 @@ int BcmWRM(void *arg,
void *buff,
int len)
{
- return InterfaceWRM((PS_INTERFACE_ADAPTER)arg, addr, buff, len);
+ return InterfaceWRM((struct bcm_interface_adapter *)arg, addr, buff, len);
}
int Bcm_clear_halt_of_endpoints(struct bcm_mini_adapter *Adapter)
{
- PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter);
+ struct bcm_interface_adapter *psIntfAdapter = (struct bcm_interface_adapter *)(Adapter->pvInterfaceAdapter);
int status = STATUS_SUCCESS;
/*
@@ -154,7 +154,7 @@ int Bcm_clear_halt_of_endpoints(struct bcm_mini_adapter *Adapter)
return status;
}
-void Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter)
+void Bcm_kill_all_URBs(struct bcm_interface_adapter *psIntfAdapter)
{
struct urb *tempUrb = NULL;
unsigned int i;
@@ -206,9 +206,9 @@ void Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter)
void putUsbSuspend(struct work_struct *work)
{
- PS_INTERFACE_ADAPTER psIntfAdapter = NULL;
+ struct bcm_interface_adapter *psIntfAdapter = NULL;
struct usb_interface *intf = NULL;
- psIntfAdapter = container_of(work, S_INTERFACE_ADAPTER, usbSuspendWork);
+ psIntfAdapter = container_of(work, struct bcm_interface_adapter, usbSuspendWork);
intf = psIntfAdapter->interface;
if (psIntfAdapter->bSuspended == FALSE)