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_proc.c

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
index b45de9bc1b20ca31666e48d67b5dab6ac017775c..935608e72007e25cb075f10f2940ba0977ea3ff0 100644 (file)
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
@@ -65,7 +65,7 @@ int ft1000ReadProc(char *page, char **start, off_t off,
        time_t delta;
 
        dev = (struct net_device *)data;
-       info = (FT1000_INFO *) netdev_priv(dev);
+       info = netdev_priv(dev);
 
        if (off > 0) {
                *eof = 1;
@@ -174,7 +174,7 @@ static int ft1000NotifyProc(struct notifier_block *this, unsigned long event,
        struct net_device *dev = ptr;
        FT1000_INFO *info;
 
-       info = (FT1000_INFO *) netdev_priv(dev);
+       info = netdev_priv(dev);
 
        switch (event) {
        case NETDEV_CHANGENAME:
@@ -195,7 +195,7 @@ void ft1000InitProc(struct net_device *dev)
 {
        FT1000_INFO *info;
 
-       info = (FT1000_INFO *) netdev_priv(dev);
+       info = netdev_priv(dev);
 
        info->proc_ft1000 = proc_mkdir(FT1000_PROC, init_net.proc_net);
        create_proc_read_entry(dev->name, 0644, info->proc_ft1000,
@@ -208,7 +208,7 @@ void ft1000CleanupProc(struct net_device *dev)
 {
        FT1000_INFO *info;
 
-       info = (FT1000_INFO *) netdev_priv(dev);
+       info = netdev_priv(dev);
 
        remove_proc_entry(dev->name, info->proc_ft1000);
        remove_proc_entry(FT1000_PROC, init_net.proc_net);