diff options
| author | Hanna V. Linder <hannal@us.ibm.com> | 2003-05-07 01:00:32 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2003-05-07 01:00:32 -0700 |
| commit | 51442d5a9f8e4bdca0126476d2f24203df37e21a (patch) | |
| tree | f6410a97204f151951b60e238a4fd0ef3efb63e0 | |
| parent | fb7621190cebf007972111e3f13c9bbfa9e12555 (diff) | |
[PATCH] moxa tty_driver add .owner field remove MOD_INC/DEC_USE_COUNT
| -rw-r--r-- | drivers/char/moxa.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index e942e6ed978b..a098dd65294e 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c @@ -341,6 +341,7 @@ int moxa_init(void) memset(&moxaDriver, 0, sizeof(struct tty_driver)); memset(&moxaCallout, 0, sizeof(struct tty_driver)); moxaDriver.magic = TTY_DRIVER_MAGIC; + moxaDriver.owner = THIS_MODULE; moxaDriver.name = "ttya"; moxaDriver.major = ttymajor; moxaDriver.minor_start = 0; @@ -544,7 +545,6 @@ static void do_moxa_softint(void *private_) ch->asyncflags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CALLOUT_ACTIVE); } } - MOD_DEC_USE_COUNT; } static int moxa_open(struct tty_struct *tty, struct file *filp) @@ -556,7 +556,6 @@ static int moxa_open(struct tty_struct *tty, struct file *filp) port = PORTNO(tty); if (port == MAX_PORTS) { - MOD_INC_USE_COUNT; return (0); } if (!MoxaPortIsValid(port)) { @@ -579,7 +578,6 @@ static int moxa_open(struct tty_struct *tty, struct file *filp) } up(&moxaBuffSem); - MOD_INC_USE_COUNT; ch = &moxaChannels[port]; ch->count++; tty->driver_data = ch; @@ -619,7 +617,6 @@ static void moxa_close(struct tty_struct *tty, struct file *filp) port = PORTNO(tty); if (port == MAX_PORTS) { - MOD_DEC_USE_COUNT; return; } if (!MoxaPortIsValid(port)) { @@ -633,7 +630,6 @@ static void moxa_close(struct tty_struct *tty, struct file *filp) return; } if (tty_hung_up_p(filp)) { - MOD_DEC_USE_COUNT; return; } ch = (struct moxa_str *) tty->driver_data; @@ -649,7 +645,6 @@ static void moxa_close(struct tty_struct *tty, struct file *filp) ch->count = 0; } if (ch->count) { - MOD_DEC_USE_COUNT; return; } ch->asyncflags |= ASYNC_CLOSING; @@ -688,7 +683,6 @@ static void moxa_close(struct tty_struct *tty, struct file *filp) ch->asyncflags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CALLOUT_ACTIVE | ASYNC_CLOSING); wake_up_interruptible(&ch->close_wait); - MOD_DEC_USE_COUNT; } static int moxa_write(struct tty_struct *tty, int from_user, @@ -1024,9 +1018,7 @@ static void moxa_poll(unsigned long ignored) wake_up_interruptible(&ch->open_wait); else { set_bit(MOXA_EVENT_HANGUP, &ch->event); - MOD_DEC_USE_COUNT; - if (schedule_work(&ch->tqueue) == 0) - MOD_INC_USE_COUNT; + schedule_work(&ch->tqueue); } } } |