diff options
author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-07-10 07:45:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 16:24:22 -0400 |
commit | 32ea086b7b6423e8ab1874389741bcef4d50f938 (patch) | |
tree | f506440c23d41b6c65d5b131b399f75465dab42f /arch/cris/arch-v10 | |
parent | aeceb15738958fe59cd9fe537f40317b1a3bc731 (diff) |
[PATCH] cris: switch to iminor/imajor
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/cris/arch-v10')
-rw-r--r-- | arch/cris/arch-v10/drivers/eeprom.c | 4 | ||||
-rw-r--r-- | arch/cris/arch-v10/drivers/gpio.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/cris/arch-v10/drivers/eeprom.c b/arch/cris/arch-v10/drivers/eeprom.c index 037582028560..6e1f191a71e3 100644 --- a/arch/cris/arch-v10/drivers/eeprom.c +++ b/arch/cris/arch-v10/drivers/eeprom.c | |||
@@ -450,9 +450,9 @@ int __init eeprom_init(void) | |||
450 | static int eeprom_open(struct inode * inode, struct file * file) | 450 | static int eeprom_open(struct inode * inode, struct file * file) |
451 | { | 451 | { |
452 | 452 | ||
453 | if(MINOR(inode->i_rdev) != EEPROM_MINOR_NR) | 453 | if(iminor(inode) != EEPROM_MINOR_NR) |
454 | return -ENXIO; | 454 | return -ENXIO; |
455 | if(MAJOR(inode->i_rdev) != EEPROM_MAJOR_NR) | 455 | if(imajor(inode) != EEPROM_MAJOR_NR) |
456 | return -ENXIO; | 456 | return -ENXIO; |
457 | 457 | ||
458 | if( eeprom.size > 0 ) | 458 | if( eeprom.size > 0 ) |
diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c index 48fd801792d1..fcba6632ed7b 100644 --- a/arch/cris/arch-v10/drivers/gpio.c +++ b/arch/cris/arch-v10/drivers/gpio.c | |||
@@ -435,7 +435,7 @@ static int | |||
435 | gpio_open(struct inode *inode, struct file *filp) | 435 | gpio_open(struct inode *inode, struct file *filp) |
436 | { | 436 | { |
437 | struct gpio_private *priv; | 437 | struct gpio_private *priv; |
438 | int p = MINOR(inode->i_rdev); | 438 | int p = iminor(inode); |
439 | 439 | ||
440 | if (p > GPIO_MINOR_LAST) | 440 | if (p > GPIO_MINOR_LAST) |
441 | return -EINVAL; | 441 | return -EINVAL; |