[MIPS] Cleanup inode->r_dev usage.

imajor()/iminor() should be used instead of accessing r_dev directly.

Based on patch from Eric Sesterhenn (snakebyte@gmx.de).

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index 6179805af9f06954a26786273634aedd2b67277d..caf777f832893f43efcf2676ffc6374da615046e 100644 (file)
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -398,15 +398,14 @@ ssize_t rtlx_write(int index, void *buffer, size_t count, int user)
 
 static int file_open(struct inode *inode, struct file *filp)
 {
-       int minor = MINOR(inode->i_rdev);
+       int minor = iminor(inode);
 
        return rtlx_open(minor, (filp->f_flags & O_NONBLOCK) ? 0 : 1);
 }
 
 static int file_release(struct inode *inode, struct file *filp)
 {
-       int minor;
-       minor = MINOR(inode->i_rdev);
+       int minor = iminor(inode);
 
        return rtlx_release(minor);
 }
@@ -416,7 +415,7 @@ static unsigned int file_poll(struct file *file, poll_table * wait)
        int minor;
        unsigned int mask = 0;
 
-       minor = MINOR(file->f_dentry->d_inode->i_rdev);
+       minor = iminor(file->f_dentry->d_inode);
 
        poll_wait(file, &channel_wqs[minor].rt_queue, wait);
        poll_wait(file, &channel_wqs[minor].lx_queue, wait);
@@ -438,7 +437,7 @@ static unsigned int file_poll(struct file *file, poll_table * wait)
 static ssize_t file_read(struct file *file, char __user * buffer, size_t count,
                         loff_t * ppos)
 {
-       int minor = MINOR(file->f_dentry->d_inode->i_rdev);
+       int minor = iminor(file->f_dentry->d_inode);
 
        /* data available? */
        if (!rtlx_read_poll(minor, (file->f_flags & O_NONBLOCK) ? 0 : 1)) {
@@ -455,7 +454,7 @@ static ssize_t file_write(struct file *file, const char __user * buffer,
        struct rtlx_channel *rt;
        DECLARE_WAITQUEUE(wait, current);
 
-       minor = MINOR(file->f_dentry->d_inode->i_rdev);
+       minor = iminor(file->f_dentry->d_inode);
        rt = &rtlx->channel[minor];
 
        /* any space left... */

diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 80ffaa6d50ad0fc9b9d62474bbc62743dc9158f6..85d7df7b18e1f0a05fb4813b3da1616735b2b03d 100644 (file)
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1072,7 +1072,7 @@ static int vpe_open(struct inode *inode, struct file *filp)
        struct vpe_notifications *not;
 
        /* assume only 1 device at the mo. */
-       if ((minor = MINOR(inode->i_rdev)) != 1) {
+       if ((minor = iminor(inode)) != 1) {
                printk(KERN_WARNING "VPE loader: only vpe1 is supported\n");
                return -ENODEV;
        }
@@ -1133,7 +1133,7 @@ static int vpe_release(struct inode *inode, struct file *filp)
        struct vpe *v;
        Elf_Ehdr *hdr;
 
-       minor = MINOR(inode->i_rdev);
+       minor = iminor(inode);
        if ((v = get_vpe(minor)) == NULL)
                return -ENODEV;
 
@@ -1174,7 +1174,7 @@ static ssize_t vpe_write(struct file *file, const char __user * buffer,
        size_t ret = count;
        struct vpe *v;
 
-       minor = MINOR(file->f_dentry->d_inode->i_rdev);
+       minor = iminor(file->f_dentry->d_inode);
        if ((v = get_vpe(minor)) == NULL)
                return -ENODEV;