Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / stmmac / stmmac.h

diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/stmmac/stmmac.h
index 79bdc2e1322489d4fc226409b4f3bb50f549bf48..5f06c4706abef67647d82df14392ec692ab0ab84 100644 (file)
--- a/drivers/net/stmmac/stmmac.h
+++ b/drivers/net/stmmac/stmmac.h
@@ -20,7 +20,7 @@
   Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
 *******************************************************************************/
 
-#define DRV_MODULE_VERSION     "Apr_2010"
+#define DRV_MODULE_VERSION     "Nov_2010"
 #include <linux/platform_device.h>
 #include <linux/stmmac.h>
 
@@ -37,7 +37,6 @@ struct stmmac_priv {
        unsigned int cur_tx;
        unsigned int dirty_tx;
        unsigned int dma_tx_size;
-       int tx_coe;
        int tx_coalesce;
 
        struct dma_desc *dma_rx ;
@@ -48,7 +47,6 @@ struct stmmac_priv {
        struct sk_buff_head rx_recycle;
 
        struct net_device *dev;
-       int is_gmac;
        dma_addr_t dma_rx_phy;
        unsigned int dma_rx_size;
        unsigned int dma_buf_sz;
@@ -60,14 +58,11 @@ struct stmmac_priv {
        struct napi_struct napi;
 
        phy_interface_t phy_interface;
-       int pbl;
-       int bus_id;
        int phy_addr;
        int phy_mask;
        int (*phy_reset) (void *priv);
-       void (*fix_mac_speed) (void *priv, unsigned int speed);
-       void (*bus_setup)(void __iomem *ioaddr);
-       void *bsp_priv;
+       int rx_coe;
+       int no_csum_insertion;
 
        int phy_irq;
        struct phy_device *phydev;
@@ -77,47 +72,20 @@ struct stmmac_priv {
        unsigned int flow_ctrl;
        unsigned int pause;
        struct mii_bus *mii;
-       int mii_clk_csr;
 
        u32 msg_enable;
        spinlock_t lock;
        int wolopts;
        int wolenabled;
-       int shutdown;
 #ifdef CONFIG_STMMAC_TIMER
        struct stmmac_timer *tm;
 #endif
 #ifdef STMMAC_VLAN_TAG_USED
        struct vlan_group *vlgrp;
 #endif
-       int enh_desc;
-       int rx_coe;
-       int bugged_jumbo;
-       int no_csum_insertion;
+       struct plat_stmmacenet_data *plat;
 };
 
-#ifdef CONFIG_STM_DRIVERS
-#include <linux/stm/pad.h>
-static inline int stmmac_claim_resource(struct platform_device *pdev)
-{
-       int ret = 0;
-       struct plat_stmmacenet_data *plat_dat = pdev->dev.platform_data;
-
-       /* Pad routing setup */
-       if (IS_ERR(devm_stm_pad_claim(&pdev->dev, plat_dat->pad_config,
-                       dev_name(&pdev->dev)))) {
-               printk(KERN_ERR "%s: Failed to request pads!\n", __func__);
-               ret = -ENODEV;
-       }
-       return ret;
-}
-#else
-static inline int stmmac_claim_resource(struct platform_device *pdev)
-{
-       return 0;
-}
-#endif
-
 extern int stmmac_mdio_unregister(struct net_device *ndev);
 extern int stmmac_mdio_register(struct net_device *ndev);
 extern void stmmac_set_ethtool_ops(struct net_device *netdev);