diff options
| author | Marek Belisko | 2010-12-09 11:26:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-12-10 01:34:31 +0100 |
| commit | e34dc580dc4a76106755b88ada5903eaa427c9f4 (patch) | |
| tree | 646dda7089f7d3aa873e3e21ba1829d291e3568c /drivers/staging | |
| parent | staging: ft1000: Fix private data pointer usage. (diff) | |
| download | kernel-qcow2-linux-e34dc580dc4a76106755b88ada5903eaa427c9f4.tar.gz kernel-qcow2-linux-e34dc580dc4a76106755b88ada5903eaa427c9f4.tar.xz kernel-qcow2-linux-e34dc580dc4a76106755b88ada5903eaa427c9f4.zip | |
staging: ft1000: Remove unused pdevobj array.
We don't need to store pointer to device in some local
array because we always pass to debugfs correct device pointer.
So remove it.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c index 8b735e489878..0871e43159c6 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c @@ -51,10 +51,6 @@ static long ft1000_ChIoctl(struct file *File, unsigned int Command, unsigned long Argument); static int ft1000_ChRelease (struct inode *Inode, struct file *File); -// Global pointer to device object -static struct ft1000_device *pdevobj[MAX_NUM_CARDS + 2]; -//static devfs_handle_t ft1000Handle[MAX_NUM_CARDS]; - // List to free receive command buffer pool struct list_head freercvpool; @@ -165,11 +161,6 @@ int ft1000_CreateDevice(struct ft1000_device *dev) DEBUG("ft1000_CreateDevice: number of instance = %d\n", ft1000_flarion_cnt); DEBUG("DeviceCreated = %x\n", info->DeviceCreated); - //save the device info to global array - pdevobj[info->CardNumber] = dev; - - DEBUG("ft1000_CreateDevice: ******SAVED pdevobj[%d]=%p\n", info->CardNumber, pdevobj[info->CardNumber]); //aelias [+] reason:up - if (info->DeviceCreated) { DEBUG("ft1000_CreateDevice: \"%s\" already registered\n", info->DeviceName); @@ -327,8 +318,6 @@ void ft1000_DestroyDevice(struct net_device *dev) // devfs_unregister(ft1000Handle[info->CardNumber]); info->DeviceCreated = FALSE; - - pdevobj[info->CardNumber] = NULL; } @@ -356,18 +345,6 @@ static int ft1000_ChOpen (struct inode *Inode, struct file *File) info = File->private_data = netdev_priv(dev->net); - for (i=0; i<5; i++) - DEBUG("pdevobj[%d]=%p\n", i, pdevobj[i]); //aelias [+] reason: down - - if ( pdevobj[num] != NULL ) - //info = (struct ft1000_info *)(pdevobj[num]->net->priv); - info = netdev_priv(pdevobj[num]->net); - else - { - DEBUG("ft1000_ChOpen: can not find device object %d\n", num); - return -1; - } - DEBUG("f_owner = %p number of application = %d\n", (&File->f_owner), info->appcnt ); // Check if maximum number of application exceeded |