Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205975
b: refs/heads/master
c: 94daa64
h: refs/heads/master
i:
  205973: 355052e
  205971: 077fd6f
  205967: 7202279
v: v3
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed Jul 22, 2010
1 parent 1c8a7bf commit 266676b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b8761d2e8a32f3457945a66d5bd8606abbc0e34
refs/heads/master: 94daa643c144a5f76ac9ee2506084793d608374b
22 changes: 9 additions & 13 deletions trunk/drivers/staging/dt3155/dt3155_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ MA 02111-1307 USA
+ might want to get rid of MAXboards for allocating initial buffer.
confusing and not necessary
+ in cleanup_module the MOD_IN_USE looks like it is check after it should
+ in dt3155_exit the MOD_IN_USE looks like it is check after it should
* GFP_DMA should not be set with a PCI system (pg 291)
Expand Down Expand Up @@ -166,7 +166,7 @@ static void quick_stop (int minor)
*
* - looks like this isr supports IRQ sharing (or could) JML
* - Assumes irq's are disabled, via SA_INTERRUPT flag
* being set in request_irq() call from init_module()
* being set in request_irq() call from dt3155_init()
*****************************************************/
static void dt3155_isr(int irq, void *dev_id, struct pt_regs *regs)
{
Expand Down Expand Up @@ -838,7 +838,7 @@ dt3155_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

/*****************************************************
* file operations supported by DT3155 driver
* needed by init_module
* needed by dt3155_init
* register_chrdev
*****************************************************/
static struct file_operations dt3155_fops = {
Expand Down Expand Up @@ -939,10 +939,8 @@ static int find_PCI (void)

u32 allocatorAddr = 0;

/*****************************************************
* init_module()
*****************************************************/
int init_module(void)

int dt3155_init(void)
{
struct dt3155_status *dts;
int index;
Expand Down Expand Up @@ -1061,16 +1059,12 @@ int init_module(void)
return 0;
}

/*****************************************************
* cleanup_module(void)
*
*****************************************************/
void cleanup_module(void)
void dt3155_exit(void)
{
struct dt3155_status *dts;
int index;

printk(KERN_INFO "DT3155: cleanup_module called\n");
printk(KERN_INFO "DT3155: dt3155_exit called\n");

/* removed DMA allocated with the allocator */
#ifdef STANDALONE_ALLOCATOR
Expand All @@ -1094,3 +1088,5 @@ void cleanup_module(void)
}
}

module_init(dt3155_init);
module_exit(dt3155_exit);

0 comments on commit 266676b

Please sign in to comment.