3 files changed, 8 insertions, 8 deletions

diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c
index c59ee28a35f4..ba096ebb0b15 100644
--- a/arch/cris/arch-v32/drivers/cryptocop.c
+++ b/arch/cris/arch-v32/drivers/cryptocop.c
@@ -2302,7 +2302,7 @@ static int cryptocop_job_setup(struct cryptocop_prio_job **pj, struct cryptocop_
 
 static int cryptocop_open(struct inode *inode, struct file *filp)
 {
-        int p = MINOR(inode->i_rdev);
+        int p = iminor(inode);
 
         if (p != CRYPTOCOP_MINOR) return -EINVAL;
 
diff --git a/arch/cris/arch-v32/drivers/gpio.c b/arch/cris/arch-v32/drivers/gpio.c
index 00e9167de530..c3f876b4da6b 100644
--- a/arch/cris/arch-v32/drivers/gpio.c
+++ b/arch/cris/arch-v32/drivers/gpio.c
@@ -418,7 +418,7 @@ static int
 gpio_open(struct inode *inode, struct file *filp)
 {
         struct gpio_private *priv;
-        int p = MINOR(inode->i_rdev);
+        int p = iminor(inode);
 
         if (p > GPIO_MINOR_LAST)
                 return -EINVAL;
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c
index 7c29957f5f02..e067806b2208 100644
--- a/arch/cris/arch-v32/drivers/sync_serial.c
+++ b/arch/cris/arch-v32/drivers/sync_serial.c
@@ -340,7 +340,7 @@ static inline int sync_data_avail_to_end(struct sync_port *port)
 
 static int sync_serial_open(struct inode *inode, struct file *file)
 {
-        int dev = MINOR(inode->i_rdev);
+        int dev = iminor(inode);
         sync_port* port;
         reg_dma_rw_cfg cfg = {.en = regk_dma_yes};
         reg_dma_rw_intr_mask intr_mask = {.data = regk_dma_yes};
@@ -486,7 +486,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
 
 static int sync_serial_release(struct inode *inode, struct file *file)
 {
-        int dev = MINOR(inode->i_rdev);
+        int dev = iminor(inode);
         sync_port* port;
 
         if (dev < 0 || dev >= NUMBER_OF_PORTS || !ports[dev].enabled)
@@ -504,7 +504,7 @@ static int sync_serial_release(struct inode *inode, struct file *file)
 
 static unsigned int sync_serial_poll(struct file *file, poll_table *wait)
 {
-        int dev = MINOR(file->f_dentry->d_inode->i_rdev);
+        int dev = iminor(file->f_dentry->d_inode);
         unsigned int mask = 0;
         sync_port* port;
         DEBUGPOLL( static unsigned int prev_mask = 0; );
@@ -531,7 +531,7 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file,
                   unsigned int cmd, unsigned long arg)
 {
         int return_val = 0;
-        int dev = MINOR(file->f_dentry->d_inode->i_rdev);
+        int dev = iminor(file->f_dentry->d_inode);
         sync_port* port;
         reg_sser_rw_tr_cfg tr_cfg;
         reg_sser_rw_rec_cfg rec_cfg;
@@ -789,7 +789,7 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file,
 static ssize_t sync_serial_write(struct file * file, const char * buf,
                                  size_t count, loff_t *ppos)
 {
-        int dev = MINOR(file->f_dentry->d_inode->i_rdev);
+        int dev = iminor(file->f_dentry->d_inode);
         DECLARE_WAITQUEUE(wait, current);
         sync_port *port;
         unsigned long c, c1;
@@ -919,7 +919,7 @@ static ssize_t sync_serial_write(struct file * file, const char * buf,
 static ssize_t sync_serial_read(struct file * file, char * buf,
                                 size_t count, loff_t *ppos)
 {
-        int dev = MINOR(file->f_dentry->d_inode->i_rdev);
+        int dev = iminor(file->f_dentry->d_inode);
         int avail;
         sync_port *port;
         unsigned char* start;