Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / drivers / isdn / i4l / isdn_common.c

diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index e2a945ee9f05c558eec64ee6a18df91beee318c2..9bb12ba3191fbdac568f9352f77dc05b66d051cc 100644 (file)
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -876,7 +876,7 @@ isdn_readbchan(int di, int channel, u_char *buf, u_char *fp, int len, wait_queue
  * of the mapping (di,ch)<->minor, happen during the sleep? --he
  */
 int
-isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack)
+isdn_readbchan_tty(int di, int channel, struct tty_port *port, int cisco_hack)
 {
        int count;
        int count_pull;
@@ -891,7 +891,7 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack)
        if (skb_queue_empty(&dev->drv[di]->rpqueue[channel]))
                return 0;
 
-       len = tty_buffer_request_room(tty, dev->drv[di]->rcvcount[channel]);
+       len = tty_buffer_request_room(port, dev->drv[di]->rcvcount[channel]);
        if (len == 0)
                return len;
 
@@ -912,7 +912,7 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack)
                        while ((count_pull < skb->len) && (len > 0)) {
                                /* push every character but the last to the tty buffer directly */
                                if (count_put)
-                                       tty_insert_flip_char(tty, last, TTY_NORMAL);
+                                       tty_insert_flip_char(port, last, TTY_NORMAL);
                                len--;
                                if (dev->drv[di]->DLEflag & DLEmask) {
                                        last = DLE;
@@ -940,7 +940,7 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack)
                        }
                        count_put = count_pull;
                        if (count_put > 1)
-                               tty_insert_flip_string(tty, skb->data, count_put - 1);
+                               tty_insert_flip_string(port, skb->data, count_put - 1);
                        last = skb->data[count_put - 1];
                        len -= count_put;
 #ifdef CONFIG_ISDN_AUDIO
@@ -952,16 +952,16 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack)
                         * Now we can dequeue it.
                         */
                        if (cisco_hack)
-                               tty_insert_flip_char(tty, last, 0xFF);
+                               tty_insert_flip_char(port, last, 0xFF);
                        else
-                               tty_insert_flip_char(tty, last, TTY_NORMAL);
+                               tty_insert_flip_char(port, last, TTY_NORMAL);
 #ifdef CONFIG_ISDN_AUDIO
                        ISDN_AUDIO_SKB_LOCK(skb) = 0;
 #endif
                        skb = skb_dequeue(&dev->drv[di]->rpqueue[channel]);
                        dev_kfree_skb(skb);
                } else {
-                       tty_insert_flip_char(tty, last, TTY_NORMAL);
+                       tty_insert_flip_char(port, last, TTY_NORMAL);
                        /* Not yet emptied this buff, so it
                         * must stay in the queue, for further calls
                         * but we pull off the data we got until now.
@@ -1058,7 +1058,7 @@ isdn_info_update(void)
 static ssize_t
 isdn_read(struct file *file, char __user *buf, size_t count, loff_t *off)
 {
-       uint minor = iminor(file->f_path.dentry->d_inode);
+       uint minor = iminor(file_inode(file));
        int len = 0;
        int drvidx;
        int chidx;
@@ -1165,7 +1165,7 @@ out:
 static ssize_t
 isdn_write(struct file *file, const char __user *buf, size_t count, loff_t *off)
 {
-       uint minor = iminor(file->f_path.dentry->d_inode);
+       uint minor = iminor(file_inode(file));
        int drvidx;
        int chidx;
        int retval;
@@ -1228,7 +1228,7 @@ static unsigned int
 isdn_poll(struct file *file, poll_table *wait)
 {
        unsigned int mask = 0;
-       unsigned int minor = iminor(file->f_path.dentry->d_inode);
+       unsigned int minor = iminor(file_inode(file));
        int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);
 
        mutex_lock(&isdn_mutex);
@@ -1269,7 +1269,7 @@ out:
 static int
 isdn_ioctl(struct file *file, uint cmd, ulong arg)
 {
-       uint minor = iminor(file->f_path.dentry->d_inode);
+       uint minor = iminor(file_inode(file));
        isdn_ctrl c;
        int drvidx;
        int ret;