Skip to content

Commit

Permalink
Staging: bcm: Remove typedef for _MINI_ADAPTER and call directly.
Browse files Browse the repository at this point in the history 
This patch removes typedef for _MINI_ADAPTER, changes the
name of the struct from _MINI_ADAPTER to bcm_mini_adapter.
In addition, any calls to the following typedefs
"MINI_ADAPTER, *PMINI_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>
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jun 5, 2012
1 parent ff35204 commit 2979460
Show file tree
Hide file tree
Showing 34 changed files with 399 additions and 400 deletions.
13 changes: 6 additions & 7 deletions drivers/staging/bcm/Adapter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ struct bcm_packet_info {

struct bcm_tarang_data {
struct bcm_tarang_data *next;
struct _MINI_ADAPTER *Adapter;
struct bcm_mini_adapter *Adapter;
struct sk_buff *RxAppControlHead;
struct sk_buff *RxAppControlTail;
int AppCtrlQueueLen;
Expand All @@ -208,15 +208,15 @@ struct bcm_targetdsx_buffer {
BOOLEAN valid;
};

typedef int (*FP_FLASH_WRITE)(struct _MINI_ADAPTER *, UINT, PVOID);
typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, UINT, PVOID);

typedef int (*FP_FLASH_WRITE_STATUS)(struct _MINI_ADAPTER *, UINT, PVOID);
typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, UINT, PVOID);

/*
* Driver adapter data structure
*/
struct _MINI_ADAPTER {
struct _MINI_ADAPTER *next;
struct bcm_mini_adapter {
struct bcm_mini_adapter *next;
struct net_device *dev;
u32 msg_enable;
CHAR *caDsxReqResp;
Expand Down Expand Up @@ -394,7 +394,6 @@ struct _MINI_ADAPTER {
UINT gpioBitMap;
S_BCM_DEBUG_STATE stDebugState;
};
typedef struct _MINI_ADAPTER MINI_ADAPTER, *PMINI_ADAPTER;

#define GET_BCM_ADAPTER(net_dev) netdev_priv(net_dev)

Expand All @@ -417,7 +416,7 @@ struct bcm_ddr_setting {
UINT ulRegAddress;
UINT ulRegValue;
};
int InitAdapter(PMINI_ADAPTER psAdapter);
int InitAdapter(struct bcm_mini_adapter *psAdapter);

/* =====================================================================
* Beceem vendor request codes for EP0
Expand Down
12 changes: 6 additions & 6 deletions drivers/staging/bcm/Bcmchar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

static int bcm_char_open(struct inode *inode, struct file * filp)
{
PMINI_ADAPTER Adapter = NULL;
struct bcm_mini_adapter *Adapter = NULL;
struct bcm_tarang_data *pTarang = NULL;

Adapter = GET_BCM_ADAPTER(gblpnetdev);
Expand Down Expand Up @@ -44,7 +44,7 @@ static int bcm_char_open(struct inode *inode, struct file * filp)
static int bcm_char_release(struct inode *inode, struct file *filp)
{
struct bcm_tarang_data *pTarang, *tmp, *ptmp;
PMINI_ADAPTER Adapter = NULL;
struct bcm_mini_adapter *Adapter = NULL;
struct sk_buff *pkt, *npkt;

pTarang = (struct bcm_tarang_data *)filp->private_data;
Expand Down Expand Up @@ -98,7 +98,7 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size,
loff_t *f_pos)
{
struct bcm_tarang_data *pTarang = filp->private_data;
PMINI_ADAPTER Adapter = pTarang->Adapter;
struct bcm_mini_adapter *Adapter = pTarang->Adapter;
struct sk_buff *Packet = NULL;
ssize_t PktLen = 0;
int wait_ret_val = 0;
Expand Down Expand Up @@ -157,7 +157,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
{
struct bcm_tarang_data *pTarang = filp->private_data;
void __user *argp = (void __user *)arg;
PMINI_ADAPTER Adapter = pTarang->Adapter;
struct bcm_mini_adapter *Adapter = pTarang->Adapter;
INT Status = STATUS_FAILURE;
int timeout = 0;
IOCTL_BUFFER IoBuffer;
Expand Down Expand Up @@ -2014,7 +2014,7 @@ static const struct file_operations bcm_fops = {
.llseek = no_llseek,
};

int register_control_device_interface(PMINI_ADAPTER Adapter)
int register_control_device_interface(struct bcm_mini_adapter *Adapter)
{

if (Adapter->major > 0)
Expand All @@ -2039,7 +2039,7 @@ int register_control_device_interface(PMINI_ADAPTER Adapter)
return 0;
}

void unregister_control_device_interface(PMINI_ADAPTER Adapter)
void unregister_control_device_interface(struct bcm_mini_adapter *Adapter)
{
if (Adapter->major > 0) {
device_destroy(bcm_class, MKDEV(Adapter->major, 0));
Expand Down
18 changes: 9 additions & 9 deletions drivers/staging/bcm/Bcmnet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ struct net_device *gblpnetdev;

static INT bcm_open(struct net_device *dev)
{
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);

if (Adapter->fw_download_done == FALSE) {
pr_notice(PFX "%s: link up failed (download in progress)\n",
Expand All @@ -28,7 +28,7 @@ static INT bcm_open(struct net_device *dev)

static INT bcm_close(struct net_device *dev)
{
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);

if (netif_msg_ifdown(Adapter))
pr_info(PFX "%s: disabling interface\n", dev->name);
Expand Down Expand Up @@ -59,7 +59,7 @@ static u16 bcm_select_queue(struct net_device *dev, struct sk_buff *skb)

static netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev)
{
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
u16 qindex = skb_get_queue_mapping(skb);


Expand Down Expand Up @@ -141,7 +141,7 @@ static int bcm_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
static void bcm_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
PS_INTERFACE_ADAPTER psIntfAdapter = Adapter->pvInterfaceAdapter;
struct usb_device *udev = interface_to_usbdev(psIntfAdapter->interface);

Expand All @@ -156,21 +156,21 @@ static void bcm_get_drvinfo(struct net_device *dev,

static u32 bcm_get_link(struct net_device *dev)
{
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);

return Adapter->LinkUpStatus;
}

static u32 bcm_get_msglevel(struct net_device *dev)
{
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);

return Adapter->msg_enable;
}

static void bcm_set_msglevel(struct net_device *dev, u32 level)
{
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);

Adapter->msg_enable = level;
}
Expand All @@ -183,7 +183,7 @@ static const struct ethtool_ops bcm_ethtool_ops = {
.set_msglevel = bcm_set_msglevel,
};

int register_networkdev(PMINI_ADAPTER Adapter)
int register_networkdev(struct bcm_mini_adapter *Adapter)
{
struct net_device *net = Adapter->dev;
PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;
Expand Down Expand Up @@ -224,7 +224,7 @@ int register_networkdev(PMINI_ADAPTER Adapter)
return 0;
}

void unregister_networkdev(PMINI_ADAPTER Adapter)
void unregister_networkdev(struct bcm_mini_adapter *Adapter)
{
struct net_device *net = Adapter->dev;
PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;
Expand Down
Loading

0 comments on commit 2979460

Please sign in to comment.