Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2 files changed, 33 insertions, 11 deletions

diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 6c836c892e43..17a9cb3528fc 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -6573,6 +6573,16 @@ static int ipw2100_resume(struct pci_dev *pci_dev)
 }
 #endif
 
+static void ipw2100_shutdown(struct pci_dev *pci_dev)
+{
+        struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);
+
+        /* Take down the device; powers it off, etc. */
+        ipw2100_down(priv);
+
+        pci_disable_device(pci_dev);
+}
+
 #define IPW2100_DEV_ID(x) { PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, x }
 
 static struct pci_device_id ipw2100_pci_id_table[] __devinitdata = {
@@ -6636,6 +6646,7 @@ static struct pci_driver ipw2100_pci_driver = {
         .suspend = ipw2100_suspend,
         .resume = ipw2100_resume,
 #endif
+        .shutdown = ipw2100_shutdown,
 };
 
 /**
diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c
index e8a1ac5f8e11..bf21eb383dbd 100644
--- a/drivers/net/wireless/ipw2x00/libipw_module.c
+++ b/drivers/net/wireless/ipw2x00/libipw_module.c
@@ -248,17 +248,22 @@ u32 libipw_debug_level = 0;
 EXPORT_SYMBOL_GPL(libipw_debug_level);
 static struct proc_dir_entry *libipw_proc = NULL;
 
-static int show_debug_level(char *page, char **start, off_t offset,
-                            int count, int *eof, void *data)
+static int debug_level_proc_show(struct seq_file *m, void *v)
 {
-        return snprintf(page, count, "0x%08X\n", libipw_debug_level);
+        seq_printf(m, "0x%08X\n", libipw_debug_level);
+        return 0;
 }
 
-static int store_debug_level(struct file *file, const char __user * buffer,
-                             unsigned long count, void *data)
+static int debug_level_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, debug_level_proc_show, NULL);
+}
+
+static ssize_t debug_level_proc_write(struct file *file,
+                const char __user *buffer, size_t count, loff_t *pos)
 {
         char buf[] = "0x00000000\n";
-        unsigned long len = min((unsigned long)sizeof(buf) - 1, count);
+        size_t len = min(sizeof(buf) - 1, count);
         unsigned long val;
 
         if (copy_from_user(buf, buffer, len))
@@ -272,6 +277,15 @@ static int store_debug_level(struct file *file, const char __user * buffer,
 
         return strnlen(buf, len);
 }
+
+static const struct file_operations debug_level_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = debug_level_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = debug_level_proc_write,
+};
 #endif                          /* CONFIG_LIBIPW_DEBUG */
 
 static int __init libipw_init(void)
@@ -286,16 +300,13 @@ static int __init libipw_init(void)
                                 " proc directory\n");
                 return -EIO;
         }
-        e = create_proc_entry("debug_level", S_IFREG | S_IRUGO | S_IWUSR,
-                              libipw_proc);
+        e = proc_create("debug_level", S_IRUGO | S_IWUSR, libipw_proc,
+                        &debug_level_proc_fops);
         if (!e) {
                 remove_proc_entry(DRV_NAME, init_net.proc_net);
                 libipw_proc = NULL;
                 return -EIO;
         }
-        e->read_proc = show_debug_level;
-        e->write_proc = store_debug_level;
-        e->data = NULL;
 #endif                          /* CONFIG_LIBIPW_DEBUG */
 
         printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");