[PATCH] kdev_t fixes.

The usual search and replace type operations from various people
to various drivers..

diff --git a/arch/cris/drivers/gpio.c b/arch/cris/drivers/gpio.c
index c454e5de50465d48c7b5e46e1f9e42e9ea6598e0..445dfaa8421ffd40d952c87e450bc74f38fc2010 100644 (file)
--- a/arch/cris/drivers/gpio.c
+++ b/arch/cris/drivers/gpio.c
@@ -217,7 +217,7 @@ static int
 gpio_open(struct inode *inode, struct file *filp)
 {
        struct gpio_private *priv;
-       int p = MINOR(inode->i_rdev);
+       int p = minor(inode->i_rdev);
 
        if (p >= NUM_PORTS && p != LEDS)
                return -EINVAL;

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index d205bf2c4a8d36963212491b8e0cf1c4d588f272..5490a0e3740a616a22c1176cae1089ceaaa5f8f7 100644 (file)
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -5295,7 +5295,7 @@ static int DAC960_Open(Inode_T *Inode, File_T *File)
       DAC960_ComputeGenericDiskInfo(Controller);
       DAC960_RegisterDisk(Controller, LogicalDriveNumber);
     }
-  if (Controller->GenericDiskInfo.sizes[MINOR(Inode->i_rdev)] == 0)
+  if (Controller->GenericDiskInfo.sizes[minor(Inode->i_rdev)] == 0)
     return -ENXIO;
   /*
     Increment Controller and Logical Drive Usage Counts.

diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 3b001b5db0e2530250f4c4bad35951592a6692f0..0ce05f165b2713b9b1c40320a114a571286a95e7 100644 (file)
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -141,7 +141,7 @@ loff_t i2cdev_lseek (struct file *file, loff_t offset, int origin)
 #ifdef DEBUG
        struct inode *inode = file->f_dentry->d_inode;
        printk("i2c-dev.o: i2c-%d lseek to %ld bytes relative to %d.\n",
-              MINOR(inode->i_rdev),(long) offset,origin);
+              minor(inode->i_rdev),(long) offset,origin);
 #endif /* DEBUG */
        return -ESPIPE;
 }
@@ -165,7 +165,7 @@ static ssize_t i2cdev_read (struct file *file, char *buf, size_t count,
                return -ENOMEM;
 
 #ifdef DEBUG
-       printk("i2c-dev.o: i2c-%d reading %d bytes.\n",MINOR(inode->i_rdev),
+       printk("i2c-dev.o: i2c-%d reading %d bytes.\n",minor(inode->i_rdev),
               count);
 #endif
 
@@ -197,7 +197,7 @@ static ssize_t i2cdev_write (struct file *file, const char *buf, size_t count,
        }
 
 #ifdef DEBUG
-       printk("i2c-dev.o: i2c-%d writing %d bytes.\n",MINOR(inode->i_rdev),
+       printk("i2c-dev.o: i2c-%d writing %d bytes.\n",minor(inode->i_rdev),
               count);
 #endif
        ret = i2c_master_send(client,tmp,count);
@@ -218,7 +218,7 @@ int i2cdev_ioctl (struct inode *inode, struct file *file, unsigned int cmd,
 
 #ifdef DEBUG
        printk("i2c-dev.o: i2c-%d ioctl, cmd: 0x%x, arg: %lx.\n", 
-              MINOR(inode->i_rdev),cmd, arg);
+              minor(inode->i_rdev),cmd, arg);
 #endif /* DEBUG */
 
        switch ( cmd ) {

diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index 6194e0ceb9d71c5382a8595fd94f3874605e029a..5519f5146272b21f2a58031f6f875ceb519cd4cd 100644 (file)
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -56,7 +56,6 @@
 #define PRINTD(level, card, fmt, args...) do {} while (0)
 #endif
 
-
 static struct hpsb_host_driver *lynx_driver;
 static unsigned int card_id;
 
@@ -636,7 +635,7 @@ static void aux_setup_pcls(struct ti_lynx *lynx)
 
 static int mem_open(struct inode *inode, struct file *file)
 {
-        int cid = MINOR(inode->i_rdev);
+        int cid = minor(inode->i_rdev);
         enum { t_rom, t_aux, t_ram } type;
         struct memdata *md;
         

diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index 54279e41866568aabc09843665df6d7f68bf4cb9..947b797d19f2f0a59539f8753f9bf5f6b1468e02 100644 (file)
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -195,7 +195,7 @@ static int ftl_ioctl(struct inode *inode, struct file *file,
                     u_int cmd, u_long arg);
 static int ftl_open(struct inode *inode, struct file *file);
 static release_t ftl_close(struct inode *inode, struct file *file);
-static int ftl_reread_partitions(int minor);
+static int ftl_reread_partitions(kdev_t dev);
 
 static void ftl_erase_callback(struct erase_info *done);
 
@@ -842,7 +842,7 @@ static u_int32_t find_free(partition_t *part)
 
 static int ftl_open(struct inode *inode, struct file *file)
 {
-    int minor = MINOR(inode->i_rdev);
+    int minor = minor(inode->i_rdev);
     partition_t *partition;
 
     if (minor>>4 >= MAX_MTD_DEVICES)
@@ -878,7 +878,7 @@ static int ftl_open(struct inode *inode, struct file *file)
 
 static release_t ftl_close(struct inode *inode, struct file *file)
 {
-    int minor = MINOR(inode->i_rdev);
+    int minor = minor(inode->i_rdev);
     partition_t *part = myparts[minor >> 4];
     int i;
     
@@ -1114,7 +1114,7 @@ static int ftl_ioctl(struct inode *inode, struct file *file,
                     u_int cmd, u_long arg)
 {
     struct hd_geometry *geo = (struct hd_geometry *)arg;
-    int ret = 0, minor = MINOR(inode->i_rdev);
+    int ret = 0, minor = minor(inode->i_rdev);
     partition_t *part= myparts[minor >> 4];
     u_long sect;
 
@@ -1139,7 +1139,7 @@ static int ftl_ioctl(struct inode *inode, struct file *file,
        ret = put_user((u64)ftl_hd[minor].nr_sects << 9, (u64 *)arg);
        break;
     case BLKRRPART:
-       ret = ftl_reread_partitions(minor);
+       ret = ftl_reread_partitions(inode->i_rdev);
        break;
     case BLKROSET:
     case BLKROGET:
@@ -1161,7 +1161,7 @@ static int ftl_ioctl(struct inode *inode, struct file *file,
 
 static int ftl_reread_partitions(kdev_t dev)
 {
-    int minor = MINOR(dev);
+    int minor = minor(dev);
     partition_t *part = myparts[minor >> 4];
     int res;
 
@@ -1197,7 +1197,7 @@ static void do_ftl_request(request_arg_t)
       //           sti();
        INIT_REQUEST;
 
-       minor = MINOR(CURRENT->rq_dev);
+       minor = minor(CURRENT->rq_dev);
        
        part = myparts[minor >> 4];
        if (part) {

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index b9d3be18c2bdcd8f4f71f33acdc345f913cb09c7..2f7c1e8fa43d800b078f198b3539635ed7ffc7a0 100644 (file)
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1595,7 +1595,7 @@ static int lmLogFileSystem(log_t * log, dev_t fsdev, int activate)
                return rc;
 
        logsuper = (logsuper_t *) bpsuper->l_ldata;
-       bit = MINOR(fsdev);
+       bit = minor(fsdev);
        word = bit / 32;
        bit -= 32 * word;
        if (activate)