Commit 5fa62d1f authored by Hanna V. Linder's avatar Hanna V. Linder Committed by Greg Kroah-Hartman

[PATCH] macintosh/macserial tty_driver add .owner field remove MOD_INC/DEC_USE_COUNT

parent d1a3b250
...@@ -1932,7 +1932,6 @@ static void rs_close(struct tty_struct *tty, struct file * filp) ...@@ -1932,7 +1932,6 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
if (tty_hung_up_p(filp)) { if (tty_hung_up_p(filp)) {
MOD_DEC_USE_COUNT;
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
return; return;
} }
...@@ -1956,7 +1955,6 @@ static void rs_close(struct tty_struct *tty, struct file * filp) ...@@ -1956,7 +1955,6 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
info->count = 0; info->count = 0;
} }
if (info->count) { if (info->count) {
MOD_DEC_USE_COUNT;
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
return; return;
} }
...@@ -2026,7 +2024,6 @@ static void rs_close(struct tty_struct *tty, struct file * filp) ...@@ -2026,7 +2024,6 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
info->flags &= ~(ZILOG_NORMAL_ACTIVE|ZILOG_CALLOUT_ACTIVE| info->flags &= ~(ZILOG_NORMAL_ACTIVE|ZILOG_CALLOUT_ACTIVE|
ZILOG_CLOSING); ZILOG_CLOSING);
wake_up_interruptible(&info->close_wait); wake_up_interruptible(&info->close_wait);
MOD_DEC_USE_COUNT;
} }
/* /*
...@@ -2233,17 +2230,14 @@ static int rs_open(struct tty_struct *tty, struct file * filp) ...@@ -2233,17 +2230,14 @@ static int rs_open(struct tty_struct *tty, struct file * filp)
int retval, line; int retval, line;
unsigned long page; unsigned long page;
MOD_INC_USE_COUNT;
line = tty->index; line = tty->index;
if ((line < 0) || (line >= zs_channels_found)) { if ((line < 0) || (line >= zs_channels_found)) {
MOD_DEC_USE_COUNT;
return -ENODEV; return -ENODEV;
} }
info = zs_soft + line; info = zs_soft + line;
#ifdef CONFIG_KGDB #ifdef CONFIG_KGDB
if (info->kgdb_channel) { if (info->kgdb_channel) {
MOD_DEC_USE_COUNT;
return -ENODEV; return -ENODEV;
} }
#endif #endif
...@@ -2610,6 +2604,7 @@ int macserial_init(void) ...@@ -2610,6 +2604,7 @@ int macserial_init(void)
memset(&serial_driver, 0, sizeof(struct tty_driver)); memset(&serial_driver, 0, sizeof(struct tty_driver));
serial_driver.magic = TTY_DRIVER_MAGIC; serial_driver.magic = TTY_DRIVER_MAGIC;
serial_driver.owner = THIS_MODULE;
serial_driver.driver_name = "macserial"; serial_driver.driver_name = "macserial";
#ifdef CONFIG_DEVFS_FS #ifdef CONFIG_DEVFS_FS
serial_driver.name = "tts/"; serial_driver.name = "tts/";
......
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