Skip to content

Commit

Permalink
staging: ft1000: Remove unused/unnecessary comments.
Browse files Browse the repository at this point in the history 
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Marek Belisko authored and Greg Kroah-Hartman committed Oct 12, 2010
1 parent 7bfc9ca commit 4aee92f
Showing 1 changed file with 8 additions and 42 deletions.
50 changes: 8 additions & 42 deletions drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//
// $Id:
//====================================================
// 20090926; aelias; removed all compiler warnings; ubuntu 9.04; 2.6.28-15-generic
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
Expand All @@ -16,16 +15,6 @@
#include <linux/firmware.h>
#include "ft1000_usb.h"

//#include <linux/sched.h>
//#include <linux/ptrace.h>
//#include <linux/slab.h>
//#include <linux/string.h>
//#include <linux/timer.h>
//#include <linux/netdevice.h>
//#include <linux/ioport.h>
//#include <linux/delay.h>
//#include <asm/io.h>
//#include <asm/system.h>
#include <linux/kthread.h>

MODULE_DESCRIPTION("FT1000 EXPRESS CARD DRIVER");
Expand Down Expand Up @@ -65,8 +54,7 @@ int ft1000_poll_thread(void *arg)
}
}
}
//DEBUG("returned from polling thread\n");
return STATUS_SUCCESS;
return STATUS_SUCCESS;
}


Expand Down Expand Up @@ -104,15 +92,13 @@ static int ft1000_probe(struct usb_interface *interface, const struct usb_device

memset(ft1000dev, 0, sizeof(*ft1000dev));

//get usb device
dev = interface_to_usbdev(interface);
DEBUG("ft1000_probe: usb device descriptor info:\n");
DEBUG("ft1000_probe: number of configuration is %d\n", dev->descriptor.bNumConfigurations);

ft1000dev->dev = dev;
ft1000dev->status = 0;
ft1000dev->net = NULL;
//ft1000dev->device_lock = SPIN_LOCK_UNLOCKED;
spin_lock_init(&ft1000dev->device_lock);
ft1000dev->tx_urb = usb_alloc_urb(0, GFP_ATOMIC);
ft1000dev->rx_urb = usb_alloc_urb(0, GFP_ATOMIC);
Expand Down Expand Up @@ -171,26 +157,20 @@ static int ft1000_probe(struct usb_interface *interface, const struct usb_device
FileLength = dsp_fw->size;
release_firmware(dsp_fw);

//for ( i=0; i< MAX_NUM_CARDS+2; i++)
// pdevobj[i] = NULL;

//download dsp image
DEBUG("ft1000_probe: start downloading dsp image...\n");
init_ft1000_netdev(ft1000dev);
pft1000info = (FT1000_INFO *) netdev_priv (ft1000dev->net);

// DEBUG("In probe: pft1000info=%x\n", pft1000info); // aelias [-] reason: warning: format ???%x??? expects type ???unsigned int???, but argument 2 has type ???struct FT1000_INFO *???
DEBUG("In probe: pft1000info=%p\n", pft1000info); // aelias [+] reason: up

DEBUG("In probe: pft1000info=%p\n", pft1000info);
ret = dsp_reload(ft1000dev);
if (ret) {
printk(KERN_ERR "Problem with DSP image loading\n");
goto err_load;
}

gPollingfailed = FALSE; //mbelian
gPollingfailed = FALSE;
pft1000info->pPollThread = kthread_run(ft1000_poll_thread, ft1000dev, "ft1000_poll");
msleep(500); //mbelian
msleep(500);

while (!pft1000info->CardReady)
{
Expand All @@ -208,14 +188,13 @@ static int ft1000_probe(struct usb_interface *interface, const struct usb_device
}


//initialize network device
DEBUG("ft1000_probe::Card Ready!!!! Registering network device\n");

reg_ft1000_netdev(ft1000dev, interface);

pft1000info->NetDevRegDone = 1;

ft1000InitProc(ft1000dev->net);// +mbelian
ft1000InitProc(ft1000dev->net);

return 0;

Expand Down Expand Up @@ -245,14 +224,13 @@ static void ft1000_disconnect(struct usb_interface *interface)
DEBUG("ft1000_disconnect is called\n");

pft1000info = (PFT1000_INFO)usb_get_intfdata(interface);
// DEBUG("In disconnect pft1000info=%x\n", pft1000info); // aelias [-] reason: warning: format ???%x??? expects type ???unsigned int???, but argument 2 has type ???struct FT1000_INFO *???
DEBUG("In disconnect pft1000info=%p\n", pft1000info); // aelias [+] reason: up
DEBUG("In disconnect pft1000info=%p\n", pft1000info);



if (pft1000info)
{
ft1000CleanupProc(pft1000info); //+mbelian
ft1000CleanupProc(pft1000info);
if ( pft1000info->pPollThread )
{
kthread_stop(pft1000info->pPollThread );
Expand All @@ -264,9 +242,6 @@ static void ft1000_disconnect(struct usb_interface *interface)
{
DEBUG("ft1000_disconnect: destroy char driver\n");
ft1000_DestroyDevice(pft1000info->pFt1000Dev->net);
//DEBUG("ft1000_disconnect: calling ft1000_close\n");
//ft1000_close(pft1000info->pFt1000Dev->net);
//DEBUG("ft1000_disconnect: ft1000_close is called\n");
unregister_netdev(pft1000info->pFt1000Dev->net);
DEBUG("ft1000_disconnect: network device unregisterd\n");
free_netdev(pft1000info->pFt1000Dev->net);
Expand All @@ -278,23 +253,14 @@ static void ft1000_disconnect(struct usb_interface *interface)

DEBUG("ft1000_disconnect: urb freed\n");

kfree(pft1000info->pFt1000Dev); //+mbelian
kfree(pft1000info->pFt1000Dev);
}
kfree(pFileStart);
//terminate other kernel threads
//in multiple instances case, first find the device
//in the link list
/**if (pPollThread)
{
kthread_stop(pPollThread);
DEBUG("Polling thread is killed \n");
}**/

return;
}

static struct usb_driver ft1000_usb_driver = {
//.owner = THIS_MODULE,
.name = "ft1000usb",
.probe = ft1000_probe,
.disconnect = ft1000_disconnect,
Expand Down

0 comments on commit 4aee92f

Please sign in to comment.