Commit f2f9960d authored by Russell King's avatar Russell King

[PCMCIA] Remove unused variable warnings.

Remove unused variable 'i' in fops methods.  Fix debug macros which
were the sole consumers of this variable.
parent 393f4a7b
...@@ -549,11 +549,10 @@ static int ds_open(struct inode *inode, struct file *file) ...@@ -549,11 +549,10 @@ static int ds_open(struct inode *inode, struct file *file)
static int ds_release(struct inode *inode, struct file *file) static int ds_release(struct inode *inode, struct file *file)
{ {
socket_t i = iminor(inode);
struct pcmcia_bus_socket *s; struct pcmcia_bus_socket *s;
user_info_t *user, **link; user_info_t *user, **link;
DEBUG(0, "ds_release(socket %d)\n", i); DEBUG(0, "ds_release(socket %d)\n", iminor(inode));
user = file->private_data; user = file->private_data;
if (CHECK_USER(user)) if (CHECK_USER(user))
...@@ -585,12 +584,11 @@ static int ds_release(struct inode *inode, struct file *file) ...@@ -585,12 +584,11 @@ static int ds_release(struct inode *inode, struct file *file)
static ssize_t ds_read(struct file *file, char *buf, static ssize_t ds_read(struct file *file, char *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
socket_t i = iminor(file->f_dentry->d_inode);
struct pcmcia_bus_socket *s; struct pcmcia_bus_socket *s;
user_info_t *user; user_info_t *user;
int ret; int ret;
DEBUG(2, "ds_read(socket %d)\n", i); DEBUG(2, "ds_read(socket %d)\n", iminor(inode));
if (count < 4) if (count < 4)
return -EINVAL; return -EINVAL;
...@@ -615,11 +613,10 @@ static ssize_t ds_read(struct file *file, char *buf, ...@@ -615,11 +613,10 @@ static ssize_t ds_read(struct file *file, char *buf,
static ssize_t ds_write(struct file *file, const char *buf, static ssize_t ds_write(struct file *file, const char *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
socket_t i = iminor(file->f_dentry->d_inode);
struct pcmcia_bus_socket *s; struct pcmcia_bus_socket *s;
user_info_t *user; user_info_t *user;
DEBUG(2, "ds_write(socket %d)\n", i); DEBUG(2, "ds_write(socket %d)\n", iminor(inode));
if (count != 4) if (count != 4)
return -EINVAL; return -EINVAL;
...@@ -650,11 +647,10 @@ static ssize_t ds_write(struct file *file, const char *buf, ...@@ -650,11 +647,10 @@ static ssize_t ds_write(struct file *file, const char *buf,
/* No kernel lock - fine */ /* No kernel lock - fine */
static u_int ds_poll(struct file *file, poll_table *wait) static u_int ds_poll(struct file *file, poll_table *wait)
{ {
socket_t i = iminor(file->f_dentry->d_inode);
struct pcmcia_bus_socket *s; struct pcmcia_bus_socket *s;
user_info_t *user; user_info_t *user;
DEBUG(2, "ds_poll(socket %d)\n", i); DEBUG(2, "ds_poll(socket %d)\n", iminor(inode));
user = file->private_data; user = file->private_data;
if (CHECK_USER(user)) if (CHECK_USER(user))
...@@ -675,14 +671,13 @@ static u_int ds_poll(struct file *file, poll_table *wait) ...@@ -675,14 +671,13 @@ static u_int ds_poll(struct file *file, poll_table *wait)
static int ds_ioctl(struct inode * inode, struct file * file, static int ds_ioctl(struct inode * inode, struct file * file,
u_int cmd, u_long arg) u_int cmd, u_long arg)
{ {
socket_t i = iminor(inode);
struct pcmcia_bus_socket *s; struct pcmcia_bus_socket *s;
u_int size; u_int size;
int ret, err; int ret, err;
ds_ioctl_arg_t buf; ds_ioctl_arg_t buf;
user_info_t *user; user_info_t *user;
DEBUG(2, "ds_ioctl(socket %d, %#x, %#lx)\n", i, cmd, arg); DEBUG(2, "ds_ioctl(socket %d, %#x, %#lx)\n", iminor(inode), cmd, arg);
user = file->private_data; user = file->private_data;
if (CHECK_USER(user)) if (CHECK_USER(user))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment