Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge

8 files changed, 46 insertions, 63 deletions

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 24c6b7ca62be..6ca0bb949ad3 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1111,11 +1111,12 @@ static int capinc_tty_write(struct tty_struct * tty,
         return count;
 }
 
-static void capinc_tty_put_char(struct tty_struct *tty, unsigned char ch)
+static int capinc_tty_put_char(struct tty_struct *tty, unsigned char ch)
 {
         struct capiminor *mp = (struct capiminor *)tty->driver_data;
         struct sk_buff *skb;
         unsigned long flags;
+        int ret = 1;
 
 #ifdef _DEBUG_TTYFUNCS
         printk(KERN_DEBUG "capinc_put_char(%u)\n", ch);
@@ -1125,7 +1126,7 @@ static void capinc_tty_put_char(struct tty_struct *tty, unsigned char ch)
 #ifdef _DEBUG_TTYFUNCS
                 printk(KERN_DEBUG "capinc_tty_put_char: mp or mp->ncci NULL\n");
 #endif
-                return;
+                return 0;
         }
 
         spin_lock_irqsave(&workaround_lock, flags);
@@ -1134,7 +1135,7 @@ static void capinc_tty_put_char(struct tty_struct *tty, unsigned char ch)
                 if (skb_tailroom(skb) > 0) {
                         *(skb_put(skb, 1)) = ch;
                         spin_unlock_irqrestore(&workaround_lock, flags);
-                        return;
+                        return 1;
                 }
                 mp->ttyskb = NULL;
                 skb_queue_tail(&mp->outqueue, skb);
@@ -1148,8 +1149,10 @@ static void capinc_tty_put_char(struct tty_struct *tty, unsigned char ch)
                 mp->ttyskb = skb;
         } else {
                 printk(KERN_ERR "capinc_put_char: char %u lost\n", ch);
+                ret = 0;
         }
         spin_unlock_irqrestore(&workaround_lock, flags);
+        return ret;
 }
 
 static void capinc_tty_flush_chars(struct tty_struct *tty)
diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
index 845a797b0030..c29208bd7521 100644
--- a/drivers/isdn/capi/kcapi_proc.c
+++ b/drivers/isdn/capi/kcapi_proc.c
@@ -114,6 +114,7 @@ static int seq_contrstats_open(struct inode *inode, struct file *file)
 }
 
 static const struct file_operations proc_controller_ops = {
+        .owner          = THIS_MODULE,
         .open           = seq_controller_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -121,6 +122,7 @@ static const struct file_operations proc_controller_ops = {
 };
 
 static const struct file_operations proc_contrstats_ops = {
+        .owner          = THIS_MODULE,
         .open           = seq_contrstats_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -219,6 +221,7 @@ seq_applstats_open(struct inode *inode, struct file *file)
 }
 
 static const struct file_operations proc_applications_ops = {
+        .owner          = THIS_MODULE,
         .open           = seq_applications_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -226,21 +229,13 @@ static const struct file_operations proc_applications_ops = {
 };
 
 static const struct file_operations proc_applstats_ops = {
+        .owner          = THIS_MODULE,
         .open           = seq_applstats_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
         .release        = seq_release,
 };
 
-static void
-create_seq_entry(char *name, mode_t mode, const struct file_operations *f)
-{
-        struct proc_dir_entry *entry;
-        entry = create_proc_entry(name, mode, NULL);
-        if (entry)
-                entry->proc_fops = f;
-}
-
 // ---------------------------------------------------------------------------
 
 static void *capi_driver_start(struct seq_file *seq, loff_t *pos)
@@ -283,6 +278,7 @@ seq_capi_driver_open(struct inode *inode, struct file *file)
 }
 
 static const struct file_operations proc_driver_ops = {
+        .owner          = THIS_MODULE,
         .open           = seq_capi_driver_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -296,11 +292,11 @@ kcapi_proc_init(void)
 {
         proc_mkdir("capi",             NULL);
         proc_mkdir("capi/controllers", NULL);
-        create_seq_entry("capi/controller",   0, &proc_controller_ops);
-        create_seq_entry("capi/contrstats",   0, &proc_contrstats_ops);
-        create_seq_entry("capi/applications", 0, &proc_applications_ops);
-        create_seq_entry("capi/applstats",    0, &proc_applstats_ops);
-        create_seq_entry("capi/driver",       0, &proc_driver_ops);
+        proc_create("capi/controller",   0, NULL, &proc_controller_ops);
+        proc_create("capi/contrstats",   0, NULL, &proc_contrstats_ops);
+        proc_create("capi/applications", 0, NULL, &proc_applications_ops);
+        proc_create("capi/applstats",    0, NULL, &proc_applstats_ops);
+        proc_create("capi/driver",       0, NULL, &proc_driver_ops);
 }
 
 void __exit
diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c
index 4fd4c46892e3..8b256a617c8a 100644
--- a/drivers/isdn/divert/divert_procfs.c
+++ b/drivers/isdn/divert/divert_procfs.c
@@ -288,13 +288,12 @@ divert_dev_init(void)
         isdn_proc_entry = proc_mkdir("isdn", init_net.proc_net);
         if (!isdn_proc_entry)
                 return (-1);
-        isdn_divert_entry = create_proc_entry("divert", S_IFREG | S_IRUGO, isdn_proc_entry);
+        isdn_divert_entry = proc_create("divert", S_IFREG | S_IRUGO,
+                                        isdn_proc_entry, &isdn_fops);
         if (!isdn_divert_entry) {
                 remove_proc_entry("isdn", init_net.proc_net);
                 return (-1);
         }
-        isdn_divert_entry->proc_fops = &isdn_fops; 
-        isdn_divert_entry->owner = THIS_MODULE; 
 #endif  /* CONFIG_PROC_FS */
 
         return (0);
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index fceeb1d57682..45d1ee93cd39 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -68,10 +68,10 @@ static int write_modem(struct cardstate *cs)
         struct tty_struct *tty = cs->hw.ser->tty;
         struct bc_state *bcs = &cs->bcs[0];     /* only one channel */
         struct sk_buff *skb = bcs->tx_skb;
-        int sent;
+        int sent = -EOPNOTSUPP;
 
         if (!tty || !tty->driver || !skb)
-                return -EFAULT;
+                return -EINVAL;
 
         if (!skb->len) {
                 dev_kfree_skb_any(skb);
@@ -80,7 +80,8 @@ static int write_modem(struct cardstate *cs)
         }
 
         set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
-        sent = tty->driver->write(tty, skb->data, skb->len);
+        if (tty->ops->write)
+                sent = tty->ops->write(tty, skb->data, skb->len);
         gig_dbg(DEBUG_OUTPUT, "write_modem: sent %d", sent);
         if (sent < 0) {
                 /* error */
@@ -120,7 +121,7 @@ static int send_cb(struct cardstate *cs)
 
         if (cb->len) {
                 set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
-                sent = tty->driver->write(tty, cb->buf + cb->offset, cb->len);
+                sent = tty->ops->write(tty, cb->buf + cb->offset, cb->len);
                 if (sent < 0) {
                         /* error */
                         gig_dbg(DEBUG_OUTPUT, "send_cb: write error %d", sent);
@@ -440,14 +441,14 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state, unsi
         struct tty_struct *tty = cs->hw.ser->tty;
         unsigned int set, clear;
 
-        if (!tty || !tty->driver || !tty->driver->tiocmset)
-                return -EFAULT;
+        if (!tty || !tty->driver || !tty->ops->tiocmset)
+                return -EINVAL;
         set = new_state & ~old_state;
         clear = old_state & ~new_state;
         if (!set && !clear)
                 return 0;
         gig_dbg(DEBUG_IF, "tiocmset set %x clear %x", set, clear);
-        return tty->driver->tiocmset(tty, NULL, set, clear);
+        return tty->ops->tiocmset(tty, NULL, set, clear);
 }
 
 static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag)
diff --git a/drivers/isdn/hardware/eicon/divasproc.c b/drivers/isdn/hardware/eicon/divasproc.c
index 0632a2606998..fae895828a17 100644
--- a/drivers/isdn/hardware/eicon/divasproc.c
+++ b/drivers/isdn/hardware/eicon/divasproc.c
@@ -125,15 +125,11 @@ static const struct file_operations divas_fops = {
 
 int create_divas_proc(void)
 {
-        divas_proc_entry = create_proc_entry(divas_proc_name,
-                                             S_IFREG | S_IRUGO,
-                                             proc_net_eicon);
+        proc_create(divas_proc_name, S_IFREG | S_IRUGO, proc_net_eicon,
+                    &divas_fops);
         if (!divas_proc_entry)
                 return (0);
 
-        divas_proc_entry->proc_fops = &divas_fops;
-        divas_proc_entry->owner = THIS_MODULE;
-
         return (1);
 }
 
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c
index 27d890b48f88..15906d005b05 100644
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -370,6 +370,7 @@ hysdn_conf_close(struct inode *ino, struct file *filep)
 /******************************************************/
 static const struct file_operations conf_fops =
 {
+        .owner          = THIS_MODULE,
         .llseek         = no_llseek,
         .read           = hysdn_conf_read,
         .write          = hysdn_conf_write,
@@ -402,11 +403,10 @@ hysdn_procconf_init(void)
         while (card) {
 
                 sprintf(conf_name, "%s%d", PROC_CONF_BASENAME, card->myid);
-                if ((card->procconf = (void *) create_proc_entry(conf_name,
-                                             S_IFREG | S_IRUGO | S_IWUSR,
-                                            hysdn_proc_entry)) != NULL) {
-                        ((struct proc_dir_entry *) card->procconf)->proc_fops = &conf_fops;
-                        ((struct proc_dir_entry *) card->procconf)->owner = THIS_MODULE;
+                if ((card->procconf = (void *) proc_create(conf_name,
+                                                S_IFREG | S_IRUGO | S_IWUSR,
+                                                hysdn_proc_entry,
+                                                &conf_fops)) != NULL) {
                         hysdn_proclog_init(card);       /* init the log file entry */
                 }
                 card = card->next;      /* next entry */
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index 27b3991fb0ec..8991d2c8ee4a 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -380,6 +380,7 @@ hysdn_log_poll(struct file *file, poll_table * wait)
 /**************************************************/
 static const struct file_operations log_fops =
 {
+        .owner          = THIS_MODULE,
         .llseek         = no_llseek,
         .read           = hysdn_log_read,
         .write          = hysdn_log_write,
@@ -402,10 +403,9 @@ hysdn_proclog_init(hysdn_card * card)
 
         if ((pd = kzalloc(sizeof(struct procdata), GFP_KERNEL)) != NULL) {
                 sprintf(pd->log_name, "%s%d", PROC_LOG_BASENAME, card->myid);
-                if ((pd->log = create_proc_entry(pd->log_name, S_IFREG | S_IRUGO | S_IWUSR, hysdn_proc_entry)) != NULL) {
-                        pd->log->proc_fops = &log_fops; 
-                        pd->log->owner = THIS_MODULE;
-                }
+                pd->log = proc_create(pd->log_name,
+                                S_IFREG | S_IRUGO | S_IWUSR, hysdn_proc_entry,
+                                &log_fops);
 
                 init_waitqueue_head(&(pd->rd_queue));
 
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 8af0df1d5b8c..1a2222cbb805 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1352,12 +1352,14 @@ isdn_tty_tiocmget(struct tty_struct *tty, struct file *file)
         if (tty->flags & (1 << TTY_IO_ERROR))
                 return -EIO;
 
+        lock_kernel();
 #ifdef ISDN_DEBUG_MODEM_IOCTL
         printk(KERN_DEBUG "ttyI%d ioctl TIOCMGET\n", info->line);
 #endif
 
         control = info->mcr;
         status = info->msr;
+        unlock_kernel();
         return ((control & UART_MCR_RTS) ? TIOCM_RTS : 0)
             | ((control & UART_MCR_DTR) ? TIOCM_DTR : 0)
             | ((status & UART_MSR_DCD) ? TIOCM_CAR : 0)
@@ -1381,6 +1383,7 @@ isdn_tty_tiocmset(struct tty_struct *tty, struct file *file,
         printk(KERN_DEBUG "ttyI%d ioctl TIOCMxxx: %x %x\n", info->line, set, clear);
 #endif
 
+        lock_kernel();
         if (set & TIOCM_RTS)
                 info->mcr |= UART_MCR_RTS;
         if (set & TIOCM_DTR) {
@@ -1402,6 +1405,7 @@ isdn_tty_tiocmset(struct tty_struct *tty, struct file *file,
                         isdn_tty_modem_hup(info, 1);
                 }
         }
+        unlock_kernel();
         return 0;
 }
 
@@ -1435,21 +1439,6 @@ isdn_tty_ioctl(struct tty_struct *tty, struct file *file,
                                 return retval;
                         tty_wait_until_sent(tty, 0);
                         return 0;
-                case TIOCGSOFTCAR:
-#ifdef ISDN_DEBUG_MODEM_IOCTL
-                        printk(KERN_DEBUG "ttyI%d ioctl TIOCGSOFTCAR\n", info->line);
-#endif
-                        return put_user(C_CLOCAL(tty) ? 1 : 0, (ulong __user *) arg);
-                case TIOCSSOFTCAR:
-#ifdef ISDN_DEBUG_MODEM_IOCTL
-                        printk(KERN_DEBUG "ttyI%d ioctl TIOCSSOFTCAR\n", info->line);
-#endif
-                        if (get_user(arg, (ulong __user *) arg))
-                                return -EFAULT;
-                        tty->termios->c_cflag =
-                            ((tty->termios->c_cflag & ~CLOCAL) |
-                             (arg ? CLOCAL : 0));
-                        return 0;
                 case TIOCSERGETLSR:     /* Get line status register */
 #ifdef ISDN_DEBUG_MODEM_IOCTL
                         printk(KERN_DEBUG "ttyI%d ioctl TIOCSERGETLSR\n", info->line);
@@ -1472,13 +1461,14 @@ isdn_tty_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
         if (!old_termios)
                 isdn_tty_change_speed(info);
         else {
-                if (tty->termios->c_cflag == old_termios->c_cflag)
+                if (tty->termios->c_cflag == old_termios->c_cflag &&
+                    tty->termios->c_ispeed == old_termios->c_ispeed &&
+                    tty->termios->c_ospeed == old_termios->c_ospeed)
                         return;
                 isdn_tty_change_speed(info);
                 if ((old_termios->c_cflag & CRTSCTS) &&
-                    !(tty->termios->c_cflag & CRTSCTS)) {
+                    !(tty->termios->c_cflag & CRTSCTS))
                         tty->hw_stopped = 0;
-                }
         }
 }
 
@@ -1718,9 +1708,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
         }
         dev->modempoll--;
         isdn_tty_shutdown(info);
-        
-        if (tty->driver->flush_buffer)
-                tty->driver->flush_buffer(tty);
+        isdn_tty_flush_buffer(tty);
         tty_ldisc_flush(tty);
         info->tty = NULL;
         info->ncarrier = 0;