Commit 15018efc authored by Doug Ledford's avatar Doug Ledford

Christoph Hellwig posted a patch that conflicted with a lot of my own

changes, so this is the merge of his work into my own.
parent b5b8d2bf
...@@ -732,9 +732,6 @@ void esp_initialize(struct NCR_ESP *esp) ...@@ -732,9 +732,6 @@ void esp_initialize(struct NCR_ESP *esp)
/* Reset the thing before we try anything... */ /* Reset the thing before we try anything... */
esp_bootup_reset(esp, eregs); esp_bootup_reset(esp, eregs);
#ifdef MODULE
MOD_INC_USE_COUNT;
#endif
esps_in_use++; esps_in_use++;
} }
...@@ -3638,7 +3635,6 @@ int init_module(void) { return 0; } ...@@ -3638,7 +3635,6 @@ int init_module(void) { return 0; }
void cleanup_module(void) {} void cleanup_module(void) {}
void esp_release(void) void esp_release(void)
{ {
MOD_DEC_USE_COUNT;
esps_in_use--; esps_in_use--;
esps_running = esps_in_use; esps_running = esps_in_use;
} }
......
...@@ -130,12 +130,6 @@ int scsi_remove_host(struct Scsi_Host *shost) ...@@ -130,12 +130,6 @@ int scsi_remove_host(struct Scsi_Host *shost)
struct scsi_device *sdev; struct scsi_device *sdev;
struct scsi_cmnd *scmd; struct scsi_cmnd *scmd;
/*
* Current policy is all shosts go away on unregister.
*/
if (shost->hostt->module && GET_USE_COUNT(shost->hostt->module))
return 1;
/* /*
* FIXME Do ref counting. We force all of the devices offline to * FIXME Do ref counting. We force all of the devices offline to
* help prevent race conditions where other hosts/processors could * help prevent race conditions where other hosts/processors could
...@@ -499,8 +493,6 @@ int scsi_register_host(Scsi_Host_Template *shost_tp) ...@@ -499,8 +493,6 @@ int scsi_register_host(Scsi_Host_Template *shost_tp)
cur_cnt = scsi_hosts_registered; cur_cnt = scsi_hosts_registered;
MOD_INC_USE_COUNT;
/* /*
* The detect routine must carefully spinunlock/spinlock if it * The detect routine must carefully spinunlock/spinlock if it
* enables interrupts, since all interrupt handlers do spinlock as * enables interrupts, since all interrupt handlers do spinlock as
...@@ -584,8 +576,6 @@ int scsi_unregister_host(Scsi_Host_Template *shost_tp) ...@@ -584,8 +576,6 @@ int scsi_unregister_host(Scsi_Host_Template *shost_tp)
printk(KERN_INFO "scsi : %d host%s left.\n", scsi_hosts_registered, printk(KERN_INFO "scsi : %d host%s left.\n", scsi_hosts_registered,
(scsi_hosts_registered == 1) ? "" : "s"); (scsi_hosts_registered == 1) ? "" : "s");
MOD_DEC_USE_COUNT;
unlock_kernel(); unlock_kernel();
return 0; return 0;
......
...@@ -760,9 +760,8 @@ struct mega_hbas mega_hbas[MAX_CONTROLLERS]; ...@@ -760,9 +760,8 @@ struct mega_hbas mega_hbas[MAX_CONTROLLERS];
/* For controller re-ordering */ /* For controller re-ordering */
static struct file_operations megadev_fops = { static struct file_operations megadev_fops = {
ioctl:megadev_ioctl_entry, .owner = THIS_MODULE,
open:megadev_open, .ioctl = megadev_ioctl_entry,
release:megadev_close,
}; };
/* /*
...@@ -4333,15 +4332,6 @@ static void enq_scb_freelist (mega_host_config * megacfg, mega_scb * scb, int lo ...@@ -4333,15 +4332,6 @@ static void enq_scb_freelist (mega_host_config * megacfg, mega_scb * scb, int lo
} }
} }
/*
* Routines for the character/ioctl interface to the driver
*/
static int megadev_open (struct inode *inode, struct file *filep)
{
MOD_INC_USE_COUNT;
return 0; /* success */
}
static int megadev_ioctl_entry (struct inode *inode, struct file *filep, static int megadev_ioctl_entry (struct inode *inode, struct file *filep,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
...@@ -4852,16 +4842,6 @@ megadev_doioctl (mega_host_config * megacfg, Scsi_Cmnd * sc) ...@@ -4852,16 +4842,6 @@ megadev_doioctl (mega_host_config * megacfg, Scsi_Cmnd * sc)
return scb; return scb;
} }
static int
megadev_close (struct inode *inode, struct file *filep)
{
#ifdef MODULE
MOD_DEC_USE_COUNT;
#endif
return 0;
}
static int static int
mega_support_ext_cdb(mega_host_config *this_hba) mega_support_ext_cdb(mega_host_config *this_hba)
{ {
......
...@@ -1853,7 +1853,6 @@ char buf[32]; ...@@ -1853,7 +1853,6 @@ char buf[32];
printk("\n"); printk("\n");
printk(" Version %s - %s, Compiled %s at %s\n", printk(" Version %s - %s, Compiled %s at %s\n",
WD33C93_VERSION,WD33C93_DATE,__DATE__,__TIME__); WD33C93_VERSION,WD33C93_DATE,__DATE__,__TIME__);
MOD_INC_USE_COUNT;
} }
...@@ -2031,7 +2030,6 @@ void cleanup_module(void) {} ...@@ -2031,7 +2030,6 @@ void cleanup_module(void) {}
#endif #endif
void wd33c93_release(void) void wd33c93_release(void)
{ {
MOD_DEC_USE_COUNT;
} }
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment