Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm

[~andy/linux] / drivers / staging / bcm / Bcmnet.c

diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index 133e146a3dd46fd39b70b95cf7f2f6c801b307fe..6e8c7f5232148db9110141475351f991addb6b30 100644 (file)
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -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",
@@ -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);
@@ -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);
 
 
@@ -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);
 
@@ -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;
 }
@@ -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;
@@ -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;