Commit d6861cfe authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

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: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 48df0187

drivers/staging/bcm/Bcmchar.c

+1 −1
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ cntrlEnd: 
		mdelay(10);



		/* Wait for MailBox Interrupt */

		if (StartInterruptUrb((PS_INTERFACE_ADAPTER)Adapter->pvInterfaceAdapter))

		if (StartInterruptUrb((struct bcm_interface_adapter *)Adapter->pvInterfaceAdapter))

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Unable to send interrupt...\n");



		timeout = 5*HZ;

drivers/staging/bcm/Bcmnet.c

+3 −3
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static void bcm_get_drvinfo(struct net_device *dev, 
			    struct ethtool_drvinfo *info)

{

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);

	PS_INTERFACE_ADAPTER psIntfAdapter = Adapter->pvInterfaceAdapter;

	struct bcm_interface_adapter *psIntfAdapter = Adapter->pvInterfaceAdapter;

	struct usb_device *udev = interface_to_usbdev(psIntfAdapter->interface);



	strcpy(info->driver, DRV_NAME);
@@ -186,7 +186,7 @@ static const struct ethtool_ops bcm_ethtool_ops = { 
int register_networkdev(struct bcm_mini_adapter *Adapter)

{

	struct net_device *net = Adapter->dev;

	PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;

	struct bcm_interface_adapter *IntfAdapter = Adapter->pvInterfaceAdapter;

	struct usb_interface *udev = IntfAdapter->interface;

	struct usb_device *xdev = IntfAdapter->udev;
@@ -227,7 +227,7 @@ int register_networkdev(struct bcm_mini_adapter *Adapter) 
void unregister_networkdev(struct bcm_mini_adapter *Adapter)

{

	struct net_device *net = Adapter->dev;

	PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;

	struct bcm_interface_adapter *IntfAdapter = Adapter->pvInterfaceAdapter;

	struct usb_interface *udev = IntfAdapter->interface;

	struct usb_device *xdev = IntfAdapter->udev;

drivers/staging/bcm/InterfaceAdapter.h

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ typedef struct _USB_RCB { 
 * This is the interface specific Sub-Adapter

 * Structure.

 */

typedef struct _S_INTERFACE_ADAPTER {

struct bcm_interface_adapter {

	struct usb_device *udev;

	struct usb_interface *interface;

	/* Bulk endpoint in info */
@@ -75,6 +75,6 @@ typedef struct _S_INTERFACE_ADAPTER { 
	bool		bSuspended;

	bool		bPreparingForBusSuspend;

	struct work_struct usbSuspendWork;

} S_INTERFACE_ADAPTER, *PS_INTERFACE_ADAPTER;

};



#endif

drivers/staging/bcm/InterfaceDld.c

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ int InterfaceFileDownload(PVOID arg, struct file *flp, unsigned int on_chip_loc) 
	mm_segment_t oldfs = {0};

	int errno = 0, len = 0; /* ,is_config_file = 0 */

	loff_t pos = 0;

	PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)arg;

	struct bcm_interface_adapter *psIntfAdapter = (struct bcm_interface_adapter *)arg;

	/* struct bcm_mini_adapter *Adapter = psIntfAdapter->psAdapter; */

	char *buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
@@ -61,7 +61,7 @@ int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_c 
	loff_t pos = 0;

	static int fw_down;

	INT Status = STATUS_SUCCESS;

	PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)arg;

	struct bcm_interface_adapter *psIntfAdapter = (struct bcm_interface_adapter *)arg;

	int bytes;



	buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_DMA);

drivers/staging/bcm/InterfaceIdleMode.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int InterfaceAbortIdlemode(struct bcm_mini_adapter *Adapter, unsigned int 


	int 	lenwritten = 0;

	unsigned char aucAbortPattern[8]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};

	PS_INTERFACE_ADAPTER psInterfaceAdapter = Adapter->pvInterfaceAdapter;

	struct bcm_interface_adapter *psInterfaceAdapter = Adapter->pvInterfaceAdapter;



	//Abort Bus suspend if its already suspended

	if((TRUE == psInterfaceAdapter->bSuspended) && (TRUE == Adapter->bDoSuspend))

CRA Git | Maintained and supported by SUSTech CRA and CCSE