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

Commit a7113a96 authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert char-drivers 



Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6c648be6

drivers/char/cs5535_gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static inline u32 cs5535_lowhigh_base(int reg) 
static ssize_t cs5535_gpio_write(struct file *file, const char __user *data,

				 size_t len, loff_t *ppos)

{

	u32	m = iminor(file->f_dentry->d_inode);

	u32	m = iminor(file->f_path.dentry->d_inode);

	int	i, j;

	u32	base = gpio_base + cs5535_lowhigh_base(m);

	u32	m0, m1;
@@ -117,7 +117,7 @@ static ssize_t cs5535_gpio_write(struct file *file, const char __user *data, 
static ssize_t cs5535_gpio_read(struct file *file, char __user *buf,

				size_t len, loff_t *ppos)

{

	u32	m = iminor(file->f_dentry->d_inode);

	u32	m = iminor(file->f_path.dentry->d_inode);

	u32	base = gpio_base + cs5535_lowhigh_base(m);

	int	rd_bit = 1 << (m & 0x0f);

	int	i;

drivers/char/dsp56k.c

+3 −3
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int dsp56k_upload(u_char __user *bin, int len) 
static ssize_t dsp56k_read(struct file *file, char __user *buf, size_t count,

			   loff_t *ppos)

{

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	int dev = iminor(inode) & 0x0f;



	switch(dev)
@@ -264,7 +264,7 @@ static ssize_t dsp56k_read(struct file *file, char __user *buf, size_t count, 
static ssize_t dsp56k_write(struct file *file, const char __user *buf, size_t count,

			    loff_t *ppos)

{

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	int dev = iminor(inode) & 0x0f;



	switch(dev)
@@ -420,7 +420,7 @@ static int dsp56k_ioctl(struct inode *inode, struct file *file, 
#if 0

static unsigned int dsp56k_poll(struct file *file, poll_table *wait)

{

	int dev = iminor(file->f_dentry->d_inode) & 0x0f;

	int dev = iminor(file->f_path.dentry->d_inode) & 0x0f;



	switch(dev)

	{

drivers/char/dtlk.c

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void dtlk_timer_tick(unsigned long data); 
static ssize_t dtlk_read(struct file *file, char __user *buf,

			 size_t count, loff_t * ppos)

{

	unsigned int minor = iminor(file->f_dentry->d_inode);

	unsigned int minor = iminor(file->f_path.dentry->d_inode);

	char ch;

	int i = 0, retries;
@@ -174,7 +174,7 @@ static ssize_t dtlk_write(struct file *file, const char __user *buf, 
	}

#endif



	if (iminor(file->f_dentry->d_inode) != DTLK_MINOR)

	if (iminor(file->f_path.dentry->d_inode) != DTLK_MINOR)

		return -EINVAL;



	while (1) {

drivers/char/ip2/ip2main.c

+1 −1
Original line number Diff line number Diff line
@@ -2700,7 +2700,7 @@ static 
ssize_t

ip2_ipl_read(struct file *pFile, char __user *pData, size_t count, loff_t *off )

{

	unsigned int minor = iminor(pFile->f_dentry->d_inode);

	unsigned int minor = iminor(pFile->f_path.dentry->d_inode);

	int rc = 0;



#ifdef IP2DEBUG_IPL

drivers/char/istallion.c

+2 −2
Original line number Diff line number Diff line
@@ -4194,7 +4194,7 @@ static ssize_t stli_memread(struct file *fp, char __user *buf, size_t count, lof 
	void *p;

	loff_t off = *offp;



	brdnr = iminor(fp->f_dentry->d_inode);

	brdnr = iminor(fp->f_path.dentry->d_inode);

	if (brdnr >= stli_nrbrds)

		return -ENODEV;

	brdp = stli_brds[brdnr];
@@ -4258,7 +4258,7 @@ static ssize_t stli_memwrite(struct file *fp, const char __user *buf, size_t cou 
	void *p;

	loff_t off = *offp;



	brdnr = iminor(fp->f_dentry->d_inode);

	brdnr = iminor(fp->f_path.dentry->d_inode);



	if (brdnr >= stli_nrbrds)

		return -ENODEV;