Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32ea086b authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Linus Torvalds
Browse files

[PATCH] cris: switch to iminor/imajor 



Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent aeceb157

arch/cris/arch-v10/drivers/eeprom.c

+2 −2
Original line number Diff line number Diff line
@@ -450,9 +450,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 )

arch/cris/arch-v10/drivers/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,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;

arch/cris/arch-v32/drivers/cryptocop.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/cris/arch-v32/drivers/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/cris/arch-v32/drivers/sync_serial.c

+6 −6
Original line number Diff line number Diff line
@@ -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;