All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Sesterhenn <snakebyte@gmx.de>
To: kernel-janitors@vger.kernel.org
Subject: [KJ] [Patch] cleanup inode->r_dev usage in arch/cris
Date: Tue, 11 Apr 2006 21:25:41 +0000	[thread overview]
Message-ID: <1144790741.13849.2.camel@alice> (raw)

[-- Attachment #1: Type: text/plain, Size: 4092 bytes --]

hi,

imajor()/iminor() should be used instead of accessing r_dev
directly. This patch cleans up arch/cris

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>

--- linux-2.6.17-rc1/arch/cris/arch-v10/drivers/eeprom.c.orig	2006-04-11 23:18:21.000000000 +0200
+++ linux-2.6.17-rc1/arch/cris/arch-v10/drivers/eeprom.c	2006-04-11 23:18:55.000000000 +0200
@@ -451,9 +451,9 @@ int __init eeprom_init(void)
 static int eeprom_open(struct inode * inode, struct file * file)
 {
 
-  if(MINOR(inode->i_rdev) != EEPROM_MINOR_NR)
+  if(iminor(inode) != EEPROM_MINOR_NR)
      return -ENXIO;
-  if(MAJOR(inode->i_rdev) != EEPROM_MAJOR_NR)
+  if(imajor(inode) != EEPROM_MAJOR_NR)
      return -ENXIO;
 
   if( eeprom.size > 0 )
--- linux-2.6.17-rc1/arch/cris/arch-v10/drivers/gpio.c.orig	2006-04-11 23:19:03.000000000 +0200
+++ linux-2.6.17-rc1/arch/cris/arch-v10/drivers/gpio.c	2006-04-11 23:19:18.000000000 +0200
@@ -436,7 +436,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;
--- linux-2.6.17-rc1/arch/cris/arch-v32/drivers/cryptocop.c.orig	2006-04-11 23:19:34.000000000 +0200
+++ linux-2.6.17-rc1/arch/cris/arch-v32/drivers/cryptocop.c	2006-04-11 23:19:47.000000000 +0200
@@ -2302,7 +2302,7 @@ static int cryptocop_job_setup(struct cr
 
 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;
 
--- linux-2.6.17-rc1/arch/cris/arch-v32/drivers/gpio.c.orig	2006-04-11 23:19:56.000000000 +0200
+++ linux-2.6.17-rc1/arch/cris/arch-v32/drivers/gpio.c	2006-04-11 23:20:10.000000000 +0200
@@ -419,7 +419,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;
--- linux-2.6.17-rc1/arch/cris/arch-v32/drivers/sync_serial.c.orig	2006-04-11 23:20:18.000000000 +0200
+++ linux-2.6.17-rc1/arch/cris/arch-v32/drivers/sync_serial.c	2006-04-11 23:21:45.000000000 +0200
@@ -341,7 +341,7 @@ static inline int sync_data_avail_to_end
 
 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};
@@ -487,7 +487,7 @@ static int sync_serial_open(struct inode
 
 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)
@@ -505,7 +505,7 @@ static int sync_serial_release(struct in
 
 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; );
@@ -532,7 +532,7 @@ static int sync_serial_ioctl(struct inod
 		  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;
@@ -790,7 +790,7 @@ static int sync_serial_ioctl(struct inod
 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;
@@ -920,7 +920,7 @@ static ssize_t sync_serial_write(struct 
 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;



[-- Attachment #2: Type: text/plain, Size: 168 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors

             reply	other threads:[~2006-04-11 21:25 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-04-11 21:25 Eric Sesterhenn [this message]
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in Eric Sesterhenn
2006-04-12 14:58 ` Eric Sesterhenn
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in drivers/block/loop.c Eric Sesterhenn
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in arch/mips Eric Sesterhenn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1144790741.13849.2.camel@alice \
    --to=snakebyte@gmx.de \
    --cc=kernel-janitors@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.