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

[mv-sheeva.git] / drivers / staging / ft1000 / ft1000-pcmcia / ft1000_hw.c

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index eed7e94308dbc4510a83da683a9d0e154025b807..588afd5a5ddbeb3f2a97e4f8d9c2737e78b950cc 100644 (file)
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -132,7 +132,7 @@ inline void ft1000_asic_write(struct net_device *dev, u16 offset, u16 value)
 //---------------------------------------------------------------------------
 static inline u16 ft1000_read_fifo_len(struct net_device *dev)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
 
        if (info->AsicID == ELECTRABUZZ_ID) {
                return (ft1000_read_reg(dev, FT1000_REG_UFIFO_STAT) - 16);
@@ -155,7 +155,7 @@ static inline u16 ft1000_read_fifo_len(struct net_device *dev)
 //---------------------------------------------------------------------------
 u16 ft1000_read_dpram(struct net_device * dev, int offset)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        unsigned long flags;
        u16 data;
 
@@ -184,7 +184,7 @@ u16 ft1000_read_dpram(struct net_device * dev, int offset)
 static inline void ft1000_write_dpram(struct net_device *dev,
                                          int offset, u16 value)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        unsigned long flags;
 
        // Provide mutual exclusive access while reading ASIC registers.
@@ -208,7 +208,7 @@ static inline void ft1000_write_dpram(struct net_device *dev,
 //---------------------------------------------------------------------------
 u16 ft1000_read_dpram_mag_16(struct net_device *dev, int offset, int Index)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        unsigned long flags;
        u16 data;
 
@@ -242,7 +242,7 @@ u16 ft1000_read_dpram_mag_16(struct net_device *dev, int offset, int Index)
 static inline void ft1000_write_dpram_mag_16(struct net_device *dev,
                                                 int offset, u16 value, int Index)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        unsigned long flags;
 
        // Provide mutual exclusive access while reading ASIC registers.
@@ -270,7 +270,7 @@ static inline void ft1000_write_dpram_mag_16(struct net_device *dev,
 //---------------------------------------------------------------------------
 u32 ft1000_read_dpram_mag_32(struct net_device *dev, int offset)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        unsigned long flags;
        u32 data;
 
@@ -298,7 +298,7 @@ u32 ft1000_read_dpram_mag_32(struct net_device *dev, int offset)
 //---------------------------------------------------------------------------
 void ft1000_write_dpram_mag_32(struct net_device *dev, int offset, u32 value)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        unsigned long flags;
 
        // Provide mutual exclusive access while reading ASIC registers.
@@ -320,7 +320,7 @@ void ft1000_write_dpram_mag_32(struct net_device *dev, int offset, u32 value)
 //---------------------------------------------------------------------------
 static void ft1000_enable_interrupts(struct net_device *dev)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        u16 tempword;
 
        DEBUG(1, "ft1000_hw:ft1000_enable_interrupts()\n");
@@ -345,7 +345,7 @@ static void ft1000_enable_interrupts(struct net_device *dev)
 //---------------------------------------------------------------------------
 static void ft1000_disable_interrupts(struct net_device *dev)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        u16 tempword;
 
        DEBUG(1, "ft1000_hw: ft1000_disable_interrupts()\n");
@@ -370,7 +370,7 @@ static void ft1000_disable_interrupts(struct net_device *dev)
 //---------------------------------------------------------------------------
 static void ft1000_reset_asic(struct net_device *dev)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        u16 tempword;
 
        DEBUG(1, "ft1000_hw:ft1000_reset_asic called\n");
@@ -414,7 +414,7 @@ static void ft1000_reset_asic(struct net_device *dev)
 //---------------------------------------------------------------------------
 static int ft1000_reset_card(struct net_device *dev)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        u16 tempword;
        int i;
        unsigned long flags;
@@ -618,7 +618,7 @@ static void ft1000_hbchk(u_long data)
        FT1000_INFO *info;
        USHORT tempword;
 
-       info = (FT1000_INFO *) netdev_priv(dev);
+       info = netdev_priv(dev);
 
        if (info->CardReady == 1) {
                // Perform dsp heartbeat check
@@ -831,7 +831,7 @@ static void ft1000_hbchk(u_long data)
 //---------------------------------------------------------------------------
 void ft1000_send_cmd (struct net_device *dev, u16 *ptempbuffer, int size, u16 qtype)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        int i;
        u16 tempword;
        unsigned long flags;
@@ -916,7 +916,7 @@ void ft1000_send_cmd (struct net_device *dev, u16 *ptempbuffer, int size, u16 qt
 //---------------------------------------------------------------------------
 BOOLEAN ft1000_receive_cmd(struct net_device *dev, u16 * pbuffer, int maxsz, u16 *pnxtph)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        u16 size;
        u16 *ppseudohdr;
        int i;
@@ -1009,7 +1009,7 @@ BOOLEAN ft1000_receive_cmd(struct net_device *dev, u16 * pbuffer, int maxsz, u16
 //---------------------------------------------------------------------------
 void ft1000_proc_drvmsg(struct net_device *dev)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        u16 msgtype;
        u16 tempword;
        PMEDIAMSG pmediamsg;
@@ -1292,7 +1292,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
 //---------------------------------------------------------------------------
 int ft1000_parse_dpram_msg(struct net_device *dev)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        u16 doorbell;
        u16 portid;
        u16 nxtph;
@@ -1449,7 +1449,7 @@ int ft1000_parse_dpram_msg(struct net_device *dev)
 //---------------------------------------------------------------------------
 static void ft1000_flush_fifo(struct net_device *dev, u16 DrvErrNum)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        u16 i;
        u32 templong;
        u16 tempword;
@@ -1596,7 +1596,7 @@ static void ft1000_flush_fifo(struct net_device *dev, u16 DrvErrNum)
 int ft1000_copy_up_pkt(struct net_device *dev)
 {
        u16 tempword;
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        u16 len;
        struct sk_buff *skb;
        u16 i;
@@ -1783,7 +1783,7 @@ int ft1000_copy_up_pkt(struct net_device *dev)
 //---------------------------------------------------------------------------
 int ft1000_copy_down_pkt(struct net_device *dev, u16 * packet, u16 len)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        union {
                PSEUDO_HDR blk;
                u16 buff[sizeof(PSEUDO_HDR) >> 1];
@@ -1943,7 +1943,7 @@ int ft1000_copy_down_pkt(struct net_device *dev, u16 * packet, u16 len)
 
 static struct net_device_stats *ft1000_stats(struct net_device *dev)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        return (&info->stats);
 }
 
@@ -1967,7 +1967,7 @@ static int ft1000_open(struct net_device *dev)
 
 static int ft1000_close(struct net_device *dev)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
 
        DEBUG(0, "ft1000_hw: ft1000_close()\n");
 
@@ -1989,7 +1989,7 @@ static int ft1000_close(struct net_device *dev)
 
 static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        u8 *pdata;
 
        DEBUG(1, "ft1000_hw: ft1000_start_xmit()\n");
@@ -2026,7 +2026,7 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
 static irqreturn_t ft1000_interrupt(int irq, void *dev_id)
 {
        struct net_device *dev = (struct net_device *)dev_id;
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        u16 tempword;
        u16 inttype;
        int cnt;
@@ -2091,7 +2091,7 @@ static irqreturn_t ft1000_interrupt(int irq, void *dev_id)
 
 void stop_ft1000_card(struct net_device *dev)
 {
-       FT1000_INFO *info = (FT1000_INFO *) netdev_priv(dev);
+       FT1000_INFO *info = netdev_priv(dev);
        PPROV_RECORD ptr;
 //     int cnt;
 
@@ -2127,7 +2127,7 @@ static void ft1000_get_drvinfo(struct net_device *dev,
                                   struct ethtool_drvinfo *info)
 {
        FT1000_INFO *ft_info;
-       ft_info = (FT1000_INFO *) netdev_priv(dev);
+       ft_info = netdev_priv(dev);
 
        snprintf(info->driver, 32, "ft1000");
        snprintf(info->bus_info, ETHTOOL_BUSINFO_LEN, "PCMCIA 0x%lx",
@@ -2139,7 +2139,7 @@ static void ft1000_get_drvinfo(struct net_device *dev,
 static u32 ft1000_get_link(struct net_device *dev)
 {
        FT1000_INFO *info;
-       info = (FT1000_INFO *) netdev_priv(dev);
+       info = netdev_priv(dev);
        return info->mediastate;
 }
 
@@ -2185,7 +2185,7 @@ struct net_device *init_ft1000_card(unsigned short irq, int port,
        }
 
        SET_NETDEV_DEV(dev, fdev);
-       info = (FT1000_INFO *) netdev_priv(dev);
+       info = netdev_priv(dev);
 
        memset(info, 0, sizeof(FT1000_INFO));