Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c

2 files changed, 5 insertions, 23 deletions

diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index f5233f3d9eff..b89f476cd0a9 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -559,12 +559,6 @@ mptctl_fasync(int fd, struct file *filep, int mode)
         return ret;
 }
 
-static int
-mptctl_release(struct inode *inode, struct file *filep)
-{
-        return fasync_helper(-1, filep, 0, &async_queue);
-}
-
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
  *  MPT ioctl handler
@@ -2706,7 +2700,6 @@ mptctl_hp_targetinfo(unsigned long arg)
 static const struct file_operations mptctl_fops = {
         .owner =        THIS_MODULE,
         .llseek =       no_llseek,
-        .release =      mptctl_release,
         .fasync =       mptctl_fasync,
         .unlocked_ioctl = mptctl_ioctl,
 #ifdef CONFIG_COMPAT
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index a3fabdbe6ca6..f3384c32b9a1 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -1097,28 +1097,17 @@ static int cfg_fasync(int fd, struct file *fp, int on)
 static int cfg_release(struct inode *inode, struct file *file)
 {
         ulong id = (ulong) file->private_data;
-        struct i2o_cfg_info *p1, *p2;
+        struct i2o_cfg_info *p, **q;
         unsigned long flags;
 
         lock_kernel();
-        p1 = p2 = NULL;
-
         spin_lock_irqsave(&i2o_config_lock, flags);
-        for (p1 = open_files; p1;) {
-                if (p1->q_id == id) {
-
-                        if (p1->fasync)
-                                cfg_fasync(-1, file, 0);
-                        if (p2)
-                                p2->next = p1->next;
-                        else
-                                open_files = p1->next;
-
-                        kfree(p1);
+        for (q = &open_files; (p = *q) != NULL; q = &p->next) {
+                if (p->q_id == id) {
+                        *q = p->next;
+                        kfree(p);
                         break;
                 }
-                p2 = p1;
-                p1 = p1->next;
         }
         spin_unlock_irqrestore(&i2o_config_lock, flags);
         unlock_kernel();