From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 13 Apr 2012 18:28:56 +0000 (-0400)
Subject: Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f277683477c7bdff8236e731cf882b3ef89dde0d;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx
---

f277683477c7bdff8236e731cf882b3ef89dde0d
diff --cc drivers/net/wireless/ti/wl1251/debugfs.c
index 000000000000,6c274007d200..448da1f8c22f
mode 000000,100644..100644
--- a/drivers/net/wireless/ti/wl1251/debugfs.c
+++ b/drivers/net/wireless/ti/wl1251/debugfs.c
@@@ -1,0 -1,545 +1,539 @@@
+ /*
+  * This file is part of wl1251
+  *
+  * Copyright (C) 2009 Nokia Corporation
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * version 2 as published by the Free Software Foundation.
+  *
+  * This program is distributed in the hope that it will be useful, but
+  * WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA
+  *
+  */
+ 
+ #include "debugfs.h"
+ 
+ #include <linux/skbuff.h>
+ #include <linux/slab.h>
+ 
+ #include "wl1251.h"
+ #include "acx.h"
+ #include "ps.h"
+ 
+ /* ms */
+ #define WL1251_DEBUGFS_STATS_LIFETIME 1000
+ 
+ /* debugfs macros idea from mac80211 */
+ 
+ #define DEBUGFS_READONLY_FILE(name, buflen, fmt, value...)		\
+ static ssize_t name## _read(struct file *file, char __user *userbuf,	\
+ 			    size_t count, loff_t *ppos)			\
+ {									\
+ 	struct wl1251 *wl = file->private_data;				\
+ 	char buf[buflen];						\
+ 	int res;							\
+ 									\
+ 	res = scnprintf(buf, buflen, fmt "\n", ##value);		\
+ 	return simple_read_from_buffer(userbuf, count, ppos, buf, res);	\
+ }									\
+ 									\
+ static const struct file_operations name## _ops = {			\
+ 	.read = name## _read,						\
 -	.open = wl1251_open_file_generic,				\
++	.open = simple_open,						\
+ 	.llseek	= generic_file_llseek,					\
+ };
+ 
+ #define DEBUGFS_ADD(name, parent)					\
+ 	wl->debugfs.name = debugfs_create_file(#name, 0400, parent,	\
+ 					       wl, &name## _ops);	\
+ 	if (IS_ERR(wl->debugfs.name)) {					\
+ 		ret = PTR_ERR(wl->debugfs.name);			\
+ 		wl->debugfs.name = NULL;				\
+ 		goto out;						\
+ 	}
+ 
+ #define DEBUGFS_DEL(name)						\
+ 	do {								\
+ 		debugfs_remove(wl->debugfs.name);			\
+ 		wl->debugfs.name = NULL;				\
+ 	} while (0)
+ 
+ #define DEBUGFS_FWSTATS_FILE(sub, name, buflen, fmt)			\
+ static ssize_t sub## _ ##name## _read(struct file *file,		\
+ 				      char __user *userbuf,		\
+ 				      size_t count, loff_t *ppos)	\
+ {									\
+ 	struct wl1251 *wl = file->private_data;				\
+ 	char buf[buflen];						\
+ 	int res;							\
+ 									\
+ 	wl1251_debugfs_update_stats(wl);				\
+ 									\
+ 	res = scnprintf(buf, buflen, fmt "\n",				\
+ 			wl->stats.fw_stats->sub.name);			\
+ 	return simple_read_from_buffer(userbuf, count, ppos, buf, res);	\
+ }									\
+ 									\
+ static const struct file_operations sub## _ ##name## _ops = {		\
+ 	.read = sub## _ ##name## _read,					\
 -	.open = wl1251_open_file_generic,				\
++	.open = simple_open,						\
+ 	.llseek	= generic_file_llseek,					\
+ };
+ 
+ #define DEBUGFS_FWSTATS_ADD(sub, name)				\
+ 	DEBUGFS_ADD(sub## _ ##name, wl->debugfs.fw_statistics)
+ 
+ #define DEBUGFS_FWSTATS_DEL(sub, name)				\
+ 	DEBUGFS_DEL(sub## _ ##name)
+ 
+ static void wl1251_debugfs_update_stats(struct wl1251 *wl)
+ {
+ 	int ret;
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ 	ret = wl1251_ps_elp_wakeup(wl);
+ 	if (ret < 0)
+ 		goto out;
+ 
+ 	if (wl->state == WL1251_STATE_ON &&
+ 	    time_after(jiffies, wl->stats.fw_stats_update +
+ 		       msecs_to_jiffies(WL1251_DEBUGFS_STATS_LIFETIME))) {
+ 		wl1251_acx_statistics(wl, wl->stats.fw_stats);
+ 		wl->stats.fw_stats_update = jiffies;
+ 	}
+ 
+ 	wl1251_ps_elp_sleep(wl);
+ 
+ out:
+ 	mutex_unlock(&wl->mutex);
+ }
+ 
 -static int wl1251_open_file_generic(struct inode *inode, struct file *file)
 -{
 -	file->private_data = inode->i_private;
 -	return 0;
 -}
 -
+ DEBUGFS_FWSTATS_FILE(tx, internal_desc_overflow, 20, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(rx, out_of_mem, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, hdr_overflow, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, hw_stuck, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, dropped, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, fcs_err, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, xfr_hint_trig, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, path_reset, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, reset_counter, 20, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(dma, rx_requested, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(dma, rx_errors, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(dma, tx_requested, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(dma, tx_errors, 20, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(isr, cmd_cmplt, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, fiqs, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, rx_headers, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, rx_mem_overflow, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, rx_rdys, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, irqs, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, tx_procs, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, decrypt_done, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, dma0_done, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, dma1_done, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, tx_exch_complete, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, commands, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, rx_procs, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, hw_pm_mode_changes, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, host_acknowledges, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, pci_pm, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, wakeups, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, low_rssi, 20, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(wep, addr_key_count, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(wep, default_key_count, 20, "%u");
+ /* skipping wep.reserved */
+ DEBUGFS_FWSTATS_FILE(wep, key_not_found, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(wep, decrypt_fail, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(wep, packets, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(wep, interrupt, 20, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(pwr, ps_enter, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, elp_enter, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, missing_bcns, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, wake_on_host, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, wake_on_timer_exp, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, tx_with_ps, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, tx_without_ps, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, rcvd_beacons, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, power_save_off, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, enable_ps, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, disable_ps, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, fix_tsf_ps, 20, "%u");
+ /* skipping cont_miss_bcns_spread for now */
+ DEBUGFS_FWSTATS_FILE(pwr, rcvd_awake_beacons, 20, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(mic, rx_pkts, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(mic, calc_failure, 20, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(aes, encrypt_fail, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(aes, decrypt_fail, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(aes, encrypt_packets, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(aes, decrypt_packets, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(aes, encrypt_interrupt, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(aes, decrypt_interrupt, 20, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(event, heart_beat, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(event, calibration, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(event, rx_mismatch, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(event, rx_mem_empty, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(event, rx_pool, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(event, oom_late, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(event, phy_transmit_error, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(event, tx_stuck, 20, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(ps, pspoll_timeouts, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(ps, upsd_timeouts, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(ps, upsd_max_sptime, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(ps, upsd_max_apturn, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(ps, pspoll_max_apturn, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(ps, pspoll_utilization, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(ps, upsd_utilization, 20, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(rxpipe, rx_prep_beacon_drop, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(rxpipe, descr_host_int_trig_rx_data, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(rxpipe, beacon_buffer_thres_host_int_trig_rx_data,
+ 		     20, "%u");
+ DEBUGFS_FWSTATS_FILE(rxpipe, missed_beacon_host_int_trig_rx_data, 20, "%u");
+ DEBUGFS_FWSTATS_FILE(rxpipe, tx_xfr_host_int_trig_rx_data, 20, "%u");
+ 
+ DEBUGFS_READONLY_FILE(retry_count, 20, "%u", wl->stats.retry_count);
+ DEBUGFS_READONLY_FILE(excessive_retries, 20, "%u",
+ 		      wl->stats.excessive_retries);
+ 
+ static ssize_t tx_queue_len_read(struct file *file, char __user *userbuf,
+ 				 size_t count, loff_t *ppos)
+ {
+ 	struct wl1251 *wl = file->private_data;
+ 	u32 queue_len;
+ 	char buf[20];
+ 	int res;
+ 
+ 	queue_len = skb_queue_len(&wl->tx_queue);
+ 
+ 	res = scnprintf(buf, sizeof(buf), "%u\n", queue_len);
+ 	return simple_read_from_buffer(userbuf, count, ppos, buf, res);
+ }
+ 
+ static const struct file_operations tx_queue_len_ops = {
+ 	.read = tx_queue_len_read,
 -	.open = wl1251_open_file_generic,
++	.open = simple_open,
+ 	.llseek = generic_file_llseek,
+ };
+ 
+ static ssize_t tx_queue_status_read(struct file *file, char __user *userbuf,
+ 				    size_t count, loff_t *ppos)
+ {
+ 	struct wl1251 *wl = file->private_data;
+ 	char buf[3], status;
+ 	int len;
+ 
+ 	if (wl->tx_queue_stopped)
+ 		status = 's';
+ 	else
+ 		status = 'r';
+ 
+ 	len = scnprintf(buf, sizeof(buf), "%c\n", status);
+ 	return simple_read_from_buffer(userbuf, count, ppos, buf, len);
+ }
+ 
+ static const struct file_operations tx_queue_status_ops = {
+ 	.read = tx_queue_status_read,
 -	.open = wl1251_open_file_generic,
++	.open = simple_open,
+ 	.llseek = generic_file_llseek,
+ };
+ 
+ static void wl1251_debugfs_delete_files(struct wl1251 *wl)
+ {
+ 	DEBUGFS_FWSTATS_DEL(tx, internal_desc_overflow);
+ 
+ 	DEBUGFS_FWSTATS_DEL(rx, out_of_mem);
+ 	DEBUGFS_FWSTATS_DEL(rx, hdr_overflow);
+ 	DEBUGFS_FWSTATS_DEL(rx, hw_stuck);
+ 	DEBUGFS_FWSTATS_DEL(rx, dropped);
+ 	DEBUGFS_FWSTATS_DEL(rx, fcs_err);
+ 	DEBUGFS_FWSTATS_DEL(rx, xfr_hint_trig);
+ 	DEBUGFS_FWSTATS_DEL(rx, path_reset);
+ 	DEBUGFS_FWSTATS_DEL(rx, reset_counter);
+ 
+ 	DEBUGFS_FWSTATS_DEL(dma, rx_requested);
+ 	DEBUGFS_FWSTATS_DEL(dma, rx_errors);
+ 	DEBUGFS_FWSTATS_DEL(dma, tx_requested);
+ 	DEBUGFS_FWSTATS_DEL(dma, tx_errors);
+ 
+ 	DEBUGFS_FWSTATS_DEL(isr, cmd_cmplt);
+ 	DEBUGFS_FWSTATS_DEL(isr, fiqs);
+ 	DEBUGFS_FWSTATS_DEL(isr, rx_headers);
+ 	DEBUGFS_FWSTATS_DEL(isr, rx_mem_overflow);
+ 	DEBUGFS_FWSTATS_DEL(isr, rx_rdys);
+ 	DEBUGFS_FWSTATS_DEL(isr, irqs);
+ 	DEBUGFS_FWSTATS_DEL(isr, tx_procs);
+ 	DEBUGFS_FWSTATS_DEL(isr, decrypt_done);
+ 	DEBUGFS_FWSTATS_DEL(isr, dma0_done);
+ 	DEBUGFS_FWSTATS_DEL(isr, dma1_done);
+ 	DEBUGFS_FWSTATS_DEL(isr, tx_exch_complete);
+ 	DEBUGFS_FWSTATS_DEL(isr, commands);
+ 	DEBUGFS_FWSTATS_DEL(isr, rx_procs);
+ 	DEBUGFS_FWSTATS_DEL(isr, hw_pm_mode_changes);
+ 	DEBUGFS_FWSTATS_DEL(isr, host_acknowledges);
+ 	DEBUGFS_FWSTATS_DEL(isr, pci_pm);
+ 	DEBUGFS_FWSTATS_DEL(isr, wakeups);
+ 	DEBUGFS_FWSTATS_DEL(isr, low_rssi);
+ 
+ 	DEBUGFS_FWSTATS_DEL(wep, addr_key_count);
+ 	DEBUGFS_FWSTATS_DEL(wep, default_key_count);
+ 	/* skipping wep.reserved */
+ 	DEBUGFS_FWSTATS_DEL(wep, key_not_found);
+ 	DEBUGFS_FWSTATS_DEL(wep, decrypt_fail);
+ 	DEBUGFS_FWSTATS_DEL(wep, packets);
+ 	DEBUGFS_FWSTATS_DEL(wep, interrupt);
+ 
+ 	DEBUGFS_FWSTATS_DEL(pwr, ps_enter);
+ 	DEBUGFS_FWSTATS_DEL(pwr, elp_enter);
+ 	DEBUGFS_FWSTATS_DEL(pwr, missing_bcns);
+ 	DEBUGFS_FWSTATS_DEL(pwr, wake_on_host);
+ 	DEBUGFS_FWSTATS_DEL(pwr, wake_on_timer_exp);
+ 	DEBUGFS_FWSTATS_DEL(pwr, tx_with_ps);
+ 	DEBUGFS_FWSTATS_DEL(pwr, tx_without_ps);
+ 	DEBUGFS_FWSTATS_DEL(pwr, rcvd_beacons);
+ 	DEBUGFS_FWSTATS_DEL(pwr, power_save_off);
+ 	DEBUGFS_FWSTATS_DEL(pwr, enable_ps);
+ 	DEBUGFS_FWSTATS_DEL(pwr, disable_ps);
+ 	DEBUGFS_FWSTATS_DEL(pwr, fix_tsf_ps);
+ 	/* skipping cont_miss_bcns_spread for now */
+ 	DEBUGFS_FWSTATS_DEL(pwr, rcvd_awake_beacons);
+ 
+ 	DEBUGFS_FWSTATS_DEL(mic, rx_pkts);
+ 	DEBUGFS_FWSTATS_DEL(mic, calc_failure);
+ 
+ 	DEBUGFS_FWSTATS_DEL(aes, encrypt_fail);
+ 	DEBUGFS_FWSTATS_DEL(aes, decrypt_fail);
+ 	DEBUGFS_FWSTATS_DEL(aes, encrypt_packets);
+ 	DEBUGFS_FWSTATS_DEL(aes, decrypt_packets);
+ 	DEBUGFS_FWSTATS_DEL(aes, encrypt_interrupt);
+ 	DEBUGFS_FWSTATS_DEL(aes, decrypt_interrupt);
+ 
+ 	DEBUGFS_FWSTATS_DEL(event, heart_beat);
+ 	DEBUGFS_FWSTATS_DEL(event, calibration);
+ 	DEBUGFS_FWSTATS_DEL(event, rx_mismatch);
+ 	DEBUGFS_FWSTATS_DEL(event, rx_mem_empty);
+ 	DEBUGFS_FWSTATS_DEL(event, rx_pool);
+ 	DEBUGFS_FWSTATS_DEL(event, oom_late);
+ 	DEBUGFS_FWSTATS_DEL(event, phy_transmit_error);
+ 	DEBUGFS_FWSTATS_DEL(event, tx_stuck);
+ 
+ 	DEBUGFS_FWSTATS_DEL(ps, pspoll_timeouts);
+ 	DEBUGFS_FWSTATS_DEL(ps, upsd_timeouts);
+ 	DEBUGFS_FWSTATS_DEL(ps, upsd_max_sptime);
+ 	DEBUGFS_FWSTATS_DEL(ps, upsd_max_apturn);
+ 	DEBUGFS_FWSTATS_DEL(ps, pspoll_max_apturn);
+ 	DEBUGFS_FWSTATS_DEL(ps, pspoll_utilization);
+ 	DEBUGFS_FWSTATS_DEL(ps, upsd_utilization);
+ 
+ 	DEBUGFS_FWSTATS_DEL(rxpipe, rx_prep_beacon_drop);
+ 	DEBUGFS_FWSTATS_DEL(rxpipe, descr_host_int_trig_rx_data);
+ 	DEBUGFS_FWSTATS_DEL(rxpipe, beacon_buffer_thres_host_int_trig_rx_data);
+ 	DEBUGFS_FWSTATS_DEL(rxpipe, missed_beacon_host_int_trig_rx_data);
+ 	DEBUGFS_FWSTATS_DEL(rxpipe, tx_xfr_host_int_trig_rx_data);
+ 
+ 	DEBUGFS_DEL(tx_queue_len);
+ 	DEBUGFS_DEL(tx_queue_status);
+ 	DEBUGFS_DEL(retry_count);
+ 	DEBUGFS_DEL(excessive_retries);
+ }
+ 
+ static int wl1251_debugfs_add_files(struct wl1251 *wl)
+ {
+ 	int ret = 0;
+ 
+ 	DEBUGFS_FWSTATS_ADD(tx, internal_desc_overflow);
+ 
+ 	DEBUGFS_FWSTATS_ADD(rx, out_of_mem);
+ 	DEBUGFS_FWSTATS_ADD(rx, hdr_overflow);
+ 	DEBUGFS_FWSTATS_ADD(rx, hw_stuck);
+ 	DEBUGFS_FWSTATS_ADD(rx, dropped);
+ 	DEBUGFS_FWSTATS_ADD(rx, fcs_err);
+ 	DEBUGFS_FWSTATS_ADD(rx, xfr_hint_trig);
+ 	DEBUGFS_FWSTATS_ADD(rx, path_reset);
+ 	DEBUGFS_FWSTATS_ADD(rx, reset_counter);
+ 
+ 	DEBUGFS_FWSTATS_ADD(dma, rx_requested);
+ 	DEBUGFS_FWSTATS_ADD(dma, rx_errors);
+ 	DEBUGFS_FWSTATS_ADD(dma, tx_requested);
+ 	DEBUGFS_FWSTATS_ADD(dma, tx_errors);
+ 
+ 	DEBUGFS_FWSTATS_ADD(isr, cmd_cmplt);
+ 	DEBUGFS_FWSTATS_ADD(isr, fiqs);
+ 	DEBUGFS_FWSTATS_ADD(isr, rx_headers);
+ 	DEBUGFS_FWSTATS_ADD(isr, rx_mem_overflow);
+ 	DEBUGFS_FWSTATS_ADD(isr, rx_rdys);
+ 	DEBUGFS_FWSTATS_ADD(isr, irqs);
+ 	DEBUGFS_FWSTATS_ADD(isr, tx_procs);
+ 	DEBUGFS_FWSTATS_ADD(isr, decrypt_done);
+ 	DEBUGFS_FWSTATS_ADD(isr, dma0_done);
+ 	DEBUGFS_FWSTATS_ADD(isr, dma1_done);
+ 	DEBUGFS_FWSTATS_ADD(isr, tx_exch_complete);
+ 	DEBUGFS_FWSTATS_ADD(isr, commands);
+ 	DEBUGFS_FWSTATS_ADD(isr, rx_procs);
+ 	DEBUGFS_FWSTATS_ADD(isr, hw_pm_mode_changes);
+ 	DEBUGFS_FWSTATS_ADD(isr, host_acknowledges);
+ 	DEBUGFS_FWSTATS_ADD(isr, pci_pm);
+ 	DEBUGFS_FWSTATS_ADD(isr, wakeups);
+ 	DEBUGFS_FWSTATS_ADD(isr, low_rssi);
+ 
+ 	DEBUGFS_FWSTATS_ADD(wep, addr_key_count);
+ 	DEBUGFS_FWSTATS_ADD(wep, default_key_count);
+ 	/* skipping wep.reserved */
+ 	DEBUGFS_FWSTATS_ADD(wep, key_not_found);
+ 	DEBUGFS_FWSTATS_ADD(wep, decrypt_fail);
+ 	DEBUGFS_FWSTATS_ADD(wep, packets);
+ 	DEBUGFS_FWSTATS_ADD(wep, interrupt);
+ 
+ 	DEBUGFS_FWSTATS_ADD(pwr, ps_enter);
+ 	DEBUGFS_FWSTATS_ADD(pwr, elp_enter);
+ 	DEBUGFS_FWSTATS_ADD(pwr, missing_bcns);
+ 	DEBUGFS_FWSTATS_ADD(pwr, wake_on_host);
+ 	DEBUGFS_FWSTATS_ADD(pwr, wake_on_timer_exp);
+ 	DEBUGFS_FWSTATS_ADD(pwr, tx_with_ps);
+ 	DEBUGFS_FWSTATS_ADD(pwr, tx_without_ps);
+ 	DEBUGFS_FWSTATS_ADD(pwr, rcvd_beacons);
+ 	DEBUGFS_FWSTATS_ADD(pwr, power_save_off);
+ 	DEBUGFS_FWSTATS_ADD(pwr, enable_ps);
+ 	DEBUGFS_FWSTATS_ADD(pwr, disable_ps);
+ 	DEBUGFS_FWSTATS_ADD(pwr, fix_tsf_ps);
+ 	/* skipping cont_miss_bcns_spread for now */
+ 	DEBUGFS_FWSTATS_ADD(pwr, rcvd_awake_beacons);
+ 
+ 	DEBUGFS_FWSTATS_ADD(mic, rx_pkts);
+ 	DEBUGFS_FWSTATS_ADD(mic, calc_failure);
+ 
+ 	DEBUGFS_FWSTATS_ADD(aes, encrypt_fail);
+ 	DEBUGFS_FWSTATS_ADD(aes, decrypt_fail);
+ 	DEBUGFS_FWSTATS_ADD(aes, encrypt_packets);
+ 	DEBUGFS_FWSTATS_ADD(aes, decrypt_packets);
+ 	DEBUGFS_FWSTATS_ADD(aes, encrypt_interrupt);
+ 	DEBUGFS_FWSTATS_ADD(aes, decrypt_interrupt);
+ 
+ 	DEBUGFS_FWSTATS_ADD(event, heart_beat);
+ 	DEBUGFS_FWSTATS_ADD(event, calibration);
+ 	DEBUGFS_FWSTATS_ADD(event, rx_mismatch);
+ 	DEBUGFS_FWSTATS_ADD(event, rx_mem_empty);
+ 	DEBUGFS_FWSTATS_ADD(event, rx_pool);
+ 	DEBUGFS_FWSTATS_ADD(event, oom_late);
+ 	DEBUGFS_FWSTATS_ADD(event, phy_transmit_error);
+ 	DEBUGFS_FWSTATS_ADD(event, tx_stuck);
+ 
+ 	DEBUGFS_FWSTATS_ADD(ps, pspoll_timeouts);
+ 	DEBUGFS_FWSTATS_ADD(ps, upsd_timeouts);
+ 	DEBUGFS_FWSTATS_ADD(ps, upsd_max_sptime);
+ 	DEBUGFS_FWSTATS_ADD(ps, upsd_max_apturn);
+ 	DEBUGFS_FWSTATS_ADD(ps, pspoll_max_apturn);
+ 	DEBUGFS_FWSTATS_ADD(ps, pspoll_utilization);
+ 	DEBUGFS_FWSTATS_ADD(ps, upsd_utilization);
+ 
+ 	DEBUGFS_FWSTATS_ADD(rxpipe, rx_prep_beacon_drop);
+ 	DEBUGFS_FWSTATS_ADD(rxpipe, descr_host_int_trig_rx_data);
+ 	DEBUGFS_FWSTATS_ADD(rxpipe, beacon_buffer_thres_host_int_trig_rx_data);
+ 	DEBUGFS_FWSTATS_ADD(rxpipe, missed_beacon_host_int_trig_rx_data);
+ 	DEBUGFS_FWSTATS_ADD(rxpipe, tx_xfr_host_int_trig_rx_data);
+ 
+ 	DEBUGFS_ADD(tx_queue_len, wl->debugfs.rootdir);
+ 	DEBUGFS_ADD(tx_queue_status, wl->debugfs.rootdir);
+ 	DEBUGFS_ADD(retry_count, wl->debugfs.rootdir);
+ 	DEBUGFS_ADD(excessive_retries, wl->debugfs.rootdir);
+ 
+ out:
+ 	if (ret < 0)
+ 		wl1251_debugfs_delete_files(wl);
+ 
+ 	return ret;
+ }
+ 
+ void wl1251_debugfs_reset(struct wl1251 *wl)
+ {
+ 	if (wl->stats.fw_stats != NULL)
+ 		memset(wl->stats.fw_stats, 0, sizeof(*wl->stats.fw_stats));
+ 	wl->stats.retry_count = 0;
+ 	wl->stats.excessive_retries = 0;
+ }
+ 
+ int wl1251_debugfs_init(struct wl1251 *wl)
+ {
+ 	int ret;
+ 
+ 	wl->debugfs.rootdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
+ 
+ 	if (IS_ERR(wl->debugfs.rootdir)) {
+ 		ret = PTR_ERR(wl->debugfs.rootdir);
+ 		wl->debugfs.rootdir = NULL;
+ 		goto err;
+ 	}
+ 
+ 	wl->debugfs.fw_statistics = debugfs_create_dir("fw-statistics",
+ 						       wl->debugfs.rootdir);
+ 
+ 	if (IS_ERR(wl->debugfs.fw_statistics)) {
+ 		ret = PTR_ERR(wl->debugfs.fw_statistics);
+ 		wl->debugfs.fw_statistics = NULL;
+ 		goto err_root;
+ 	}
+ 
+ 	wl->stats.fw_stats = kzalloc(sizeof(*wl->stats.fw_stats),
+ 				      GFP_KERNEL);
+ 
+ 	if (!wl->stats.fw_stats) {
+ 		ret = -ENOMEM;
+ 		goto err_fw;
+ 	}
+ 
+ 	wl->stats.fw_stats_update = jiffies;
+ 
+ 	ret = wl1251_debugfs_add_files(wl);
+ 
+ 	if (ret < 0)
+ 		goto err_file;
+ 
+ 	return 0;
+ 
+ err_file:
+ 	kfree(wl->stats.fw_stats);
+ 	wl->stats.fw_stats = NULL;
+ 
+ err_fw:
+ 	debugfs_remove(wl->debugfs.fw_statistics);
+ 	wl->debugfs.fw_statistics = NULL;
+ 
+ err_root:
+ 	debugfs_remove(wl->debugfs.rootdir);
+ 	wl->debugfs.rootdir = NULL;
+ 
+ err:
+ 	return ret;
+ }
+ 
+ void wl1251_debugfs_exit(struct wl1251 *wl)
+ {
+ 	wl1251_debugfs_delete_files(wl);
+ 
+ 	kfree(wl->stats.fw_stats);
+ 	wl->stats.fw_stats = NULL;
+ 
+ 	debugfs_remove(wl->debugfs.fw_statistics);
+ 	wl->debugfs.fw_statistics = NULL;
+ 
+ 	debugfs_remove(wl->debugfs.rootdir);
+ 	wl->debugfs.rootdir = NULL;
+ 
+ }
diff --cc drivers/net/wireless/ti/wlcore/debugfs.c
index 000000000000,0b775e35b5df..d5aea1ff5ad1
mode 000000,100644..100644
--- a/drivers/net/wireless/ti/wlcore/debugfs.c
+++ b/drivers/net/wireless/ti/wlcore/debugfs.c
@@@ -1,0 -1,1204 +1,1198 @@@
+ /*
+  * This file is part of wl1271
+  *
+  * Copyright (C) 2009 Nokia Corporation
+  *
+  * Contact: Luciano Coelho <luciano.coelho@nokia.com>
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * version 2 as published by the Free Software Foundation.
+  *
+  * This program is distributed in the hope that it will be useful, but
+  * WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA
+  *
+  */
+ 
+ #include "debugfs.h"
+ 
+ #include <linux/skbuff.h>
+ #include <linux/slab.h>
+ 
+ #include "wlcore.h"
+ #include "debug.h"
+ #include "acx.h"
+ #include "ps.h"
+ #include "io.h"
+ #include "tx.h"
+ 
+ /* ms */
+ #define WL1271_DEBUGFS_STATS_LIFETIME 1000
+ 
+ /* debugfs macros idea from mac80211 */
+ #define DEBUGFS_FORMAT_BUFFER_SIZE 100
+ static int wl1271_format_buffer(char __user *userbuf, size_t count,
+ 				    loff_t *ppos, char *fmt, ...)
+ {
+ 	va_list args;
+ 	char buf[DEBUGFS_FORMAT_BUFFER_SIZE];
+ 	int res;
+ 
+ 	va_start(args, fmt);
+ 	res = vscnprintf(buf, sizeof(buf), fmt, args);
+ 	va_end(args);
+ 
+ 	return simple_read_from_buffer(userbuf, count, ppos, buf, res);
+ }
+ 
+ #define DEBUGFS_READONLY_FILE(name, fmt, value...)			\
+ static ssize_t name## _read(struct file *file, char __user *userbuf,	\
+ 			    size_t count, loff_t *ppos)			\
+ {									\
+ 	struct wl1271 *wl = file->private_data;				\
+ 	return wl1271_format_buffer(userbuf, count, ppos,		\
+ 				    fmt "\n", ##value);			\
+ }									\
+ 									\
+ static const struct file_operations name## _ops = {			\
+ 	.read = name## _read,						\
 -	.open = wl1271_open_file_generic,				\
++	.open = simple_open,						\
+ 	.llseek	= generic_file_llseek,					\
+ };
+ 
+ #define DEBUGFS_ADD(name, parent)					\
+ 	entry = debugfs_create_file(#name, 0400, parent,		\
+ 				    wl, &name## _ops);			\
+ 	if (!entry || IS_ERR(entry))					\
+ 		goto err;						\
+ 
+ #define DEBUGFS_ADD_PREFIX(prefix, name, parent)			\
+ 	do {								\
+ 		entry = debugfs_create_file(#name, 0400, parent,	\
+ 				    wl, &prefix## _## name## _ops);	\
+ 		if (!entry || IS_ERR(entry))				\
+ 			goto err;					\
+ 	} while (0);
+ 
+ #define DEBUGFS_FWSTATS_FILE(sub, name, fmt)				\
+ static ssize_t sub## _ ##name## _read(struct file *file,		\
+ 				      char __user *userbuf,		\
+ 				      size_t count, loff_t *ppos)	\
+ {									\
+ 	struct wl1271 *wl = file->private_data;				\
+ 									\
+ 	wl1271_debugfs_update_stats(wl);				\
+ 									\
+ 	return wl1271_format_buffer(userbuf, count, ppos, fmt "\n",	\
+ 				    wl->stats.fw_stats->sub.name);	\
+ }									\
+ 									\
+ static const struct file_operations sub## _ ##name## _ops = {		\
+ 	.read = sub## _ ##name## _read,					\
 -	.open = wl1271_open_file_generic,				\
++	.open = simple_open,						\
+ 	.llseek	= generic_file_llseek,					\
+ };
+ 
+ #define DEBUGFS_FWSTATS_ADD(sub, name)				\
+ 	DEBUGFS_ADD(sub## _ ##name, stats)
+ 
+ static void wl1271_debugfs_update_stats(struct wl1271 *wl)
+ {
+ 	int ret;
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ 	ret = wl1271_ps_elp_wakeup(wl);
+ 	if (ret < 0)
+ 		goto out;
+ 
+ 	if (wl->state == WL1271_STATE_ON && !wl->plt &&
+ 	    time_after(jiffies, wl->stats.fw_stats_update +
+ 		       msecs_to_jiffies(WL1271_DEBUGFS_STATS_LIFETIME))) {
+ 		wl1271_acx_statistics(wl, wl->stats.fw_stats);
+ 		wl->stats.fw_stats_update = jiffies;
+ 	}
+ 
+ 	wl1271_ps_elp_sleep(wl);
+ 
+ out:
+ 	mutex_unlock(&wl->mutex);
+ }
+ 
 -static int wl1271_open_file_generic(struct inode *inode, struct file *file)
 -{
 -	file->private_data = inode->i_private;
 -	return 0;
 -}
 -
+ DEBUGFS_FWSTATS_FILE(tx, internal_desc_overflow, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(rx, out_of_mem, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, hdr_overflow, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, hw_stuck, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, dropped, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, fcs_err, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, xfr_hint_trig, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, path_reset, "%u");
+ DEBUGFS_FWSTATS_FILE(rx, reset_counter, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(dma, rx_requested, "%u");
+ DEBUGFS_FWSTATS_FILE(dma, rx_errors, "%u");
+ DEBUGFS_FWSTATS_FILE(dma, tx_requested, "%u");
+ DEBUGFS_FWSTATS_FILE(dma, tx_errors, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(isr, cmd_cmplt, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, fiqs, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, rx_headers, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, rx_mem_overflow, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, rx_rdys, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, irqs, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, tx_procs, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, decrypt_done, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, dma0_done, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, dma1_done, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, tx_exch_complete, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, commands, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, rx_procs, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, hw_pm_mode_changes, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, host_acknowledges, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, pci_pm, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, wakeups, "%u");
+ DEBUGFS_FWSTATS_FILE(isr, low_rssi, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(wep, addr_key_count, "%u");
+ DEBUGFS_FWSTATS_FILE(wep, default_key_count, "%u");
+ /* skipping wep.reserved */
+ DEBUGFS_FWSTATS_FILE(wep, key_not_found, "%u");
+ DEBUGFS_FWSTATS_FILE(wep, decrypt_fail, "%u");
+ DEBUGFS_FWSTATS_FILE(wep, packets, "%u");
+ DEBUGFS_FWSTATS_FILE(wep, interrupt, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(pwr, ps_enter, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, elp_enter, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, missing_bcns, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, wake_on_host, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, wake_on_timer_exp, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, tx_with_ps, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, tx_without_ps, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, rcvd_beacons, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, power_save_off, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, enable_ps, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, disable_ps, "%u");
+ DEBUGFS_FWSTATS_FILE(pwr, fix_tsf_ps, "%u");
+ /* skipping cont_miss_bcns_spread for now */
+ DEBUGFS_FWSTATS_FILE(pwr, rcvd_awake_beacons, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(mic, rx_pkts, "%u");
+ DEBUGFS_FWSTATS_FILE(mic, calc_failure, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(aes, encrypt_fail, "%u");
+ DEBUGFS_FWSTATS_FILE(aes, decrypt_fail, "%u");
+ DEBUGFS_FWSTATS_FILE(aes, encrypt_packets, "%u");
+ DEBUGFS_FWSTATS_FILE(aes, decrypt_packets, "%u");
+ DEBUGFS_FWSTATS_FILE(aes, encrypt_interrupt, "%u");
+ DEBUGFS_FWSTATS_FILE(aes, decrypt_interrupt, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(event, heart_beat, "%u");
+ DEBUGFS_FWSTATS_FILE(event, calibration, "%u");
+ DEBUGFS_FWSTATS_FILE(event, rx_mismatch, "%u");
+ DEBUGFS_FWSTATS_FILE(event, rx_mem_empty, "%u");
+ DEBUGFS_FWSTATS_FILE(event, rx_pool, "%u");
+ DEBUGFS_FWSTATS_FILE(event, oom_late, "%u");
+ DEBUGFS_FWSTATS_FILE(event, phy_transmit_error, "%u");
+ DEBUGFS_FWSTATS_FILE(event, tx_stuck, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(ps, pspoll_timeouts, "%u");
+ DEBUGFS_FWSTATS_FILE(ps, upsd_timeouts, "%u");
+ DEBUGFS_FWSTATS_FILE(ps, upsd_max_sptime, "%u");
+ DEBUGFS_FWSTATS_FILE(ps, upsd_max_apturn, "%u");
+ DEBUGFS_FWSTATS_FILE(ps, pspoll_max_apturn, "%u");
+ DEBUGFS_FWSTATS_FILE(ps, pspoll_utilization, "%u");
+ DEBUGFS_FWSTATS_FILE(ps, upsd_utilization, "%u");
+ 
+ DEBUGFS_FWSTATS_FILE(rxpipe, rx_prep_beacon_drop, "%u");
+ DEBUGFS_FWSTATS_FILE(rxpipe, descr_host_int_trig_rx_data, "%u");
+ DEBUGFS_FWSTATS_FILE(rxpipe, beacon_buffer_thres_host_int_trig_rx_data, "%u");
+ DEBUGFS_FWSTATS_FILE(rxpipe, missed_beacon_host_int_trig_rx_data, "%u");
+ DEBUGFS_FWSTATS_FILE(rxpipe, tx_xfr_host_int_trig_rx_data, "%u");
+ 
+ DEBUGFS_READONLY_FILE(retry_count, "%u", wl->stats.retry_count);
+ DEBUGFS_READONLY_FILE(excessive_retries, "%u",
+ 		      wl->stats.excessive_retries);
+ 
+ static ssize_t tx_queue_len_read(struct file *file, char __user *userbuf,
+ 				 size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	u32 queue_len;
+ 	char buf[20];
+ 	int res;
+ 
+ 	queue_len = wl1271_tx_total_queue_count(wl);
+ 
+ 	res = scnprintf(buf, sizeof(buf), "%u\n", queue_len);
+ 	return simple_read_from_buffer(userbuf, count, ppos, buf, res);
+ }
+ 
+ static const struct file_operations tx_queue_len_ops = {
+ 	.read = tx_queue_len_read,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static ssize_t gpio_power_read(struct file *file, char __user *user_buf,
+ 			  size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	bool state = test_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
+ 
+ 	int res;
+ 	char buf[10];
+ 
+ 	res = scnprintf(buf, sizeof(buf), "%d\n", state);
+ 
+ 	return simple_read_from_buffer(user_buf, count, ppos, buf, res);
+ }
+ 
+ static ssize_t gpio_power_write(struct file *file,
+ 			   const char __user *user_buf,
+ 			   size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	unsigned long value;
+ 	int ret;
+ 
+ 	ret = kstrtoul_from_user(user_buf, count, 10, &value);
+ 	if (ret < 0) {
+ 		wl1271_warning("illegal value in gpio_power");
+ 		return -EINVAL;
+ 	}
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ 	if (value)
+ 		wl1271_power_on(wl);
+ 	else
+ 		wl1271_power_off(wl);
+ 
+ 	mutex_unlock(&wl->mutex);
+ 	return count;
+ }
+ 
+ static const struct file_operations gpio_power_ops = {
+ 	.read = gpio_power_read,
+ 	.write = gpio_power_write,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static ssize_t start_recovery_write(struct file *file,
+ 				    const char __user *user_buf,
+ 				    size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 
+ 	mutex_lock(&wl->mutex);
+ 	wl12xx_queue_recovery_work(wl);
+ 	mutex_unlock(&wl->mutex);
+ 
+ 	return count;
+ }
+ 
+ static const struct file_operations start_recovery_ops = {
+ 	.write = start_recovery_write,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static ssize_t dynamic_ps_timeout_read(struct file *file, char __user *user_buf,
+ 			  size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 
+ 	return wl1271_format_buffer(user_buf, count,
+ 				    ppos, "%d\n",
+ 				    wl->conf.conn.dynamic_ps_timeout);
+ }
+ 
+ static ssize_t dynamic_ps_timeout_write(struct file *file,
+ 				    const char __user *user_buf,
+ 				    size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	struct wl12xx_vif *wlvif;
+ 	unsigned long value;
+ 	int ret;
+ 
+ 	ret = kstrtoul_from_user(user_buf, count, 10, &value);
+ 	if (ret < 0) {
+ 		wl1271_warning("illegal value in dynamic_ps");
+ 		return -EINVAL;
+ 	}
+ 
+ 	if (value < 1 || value > 65535) {
+ 		wl1271_warning("dyanmic_ps_timeout is not in valid range");
+ 		return -ERANGE;
+ 	}
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ 	wl->conf.conn.dynamic_ps_timeout = value;
+ 
+ 	if (wl->state == WL1271_STATE_OFF)
+ 		goto out;
+ 
+ 	ret = wl1271_ps_elp_wakeup(wl);
+ 	if (ret < 0)
+ 		goto out;
+ 
+ 	/* In case we're already in PSM, trigger it again to set new timeout
+ 	 * immediately without waiting for re-association
+ 	 */
+ 
+ 	wl12xx_for_each_wlvif_sta(wl, wlvif) {
+ 		if (test_bit(WLVIF_FLAG_IN_PS, &wlvif->flags))
+ 			wl1271_ps_set_mode(wl, wlvif, STATION_AUTO_PS_MODE);
+ 	}
+ 
+ 	wl1271_ps_elp_sleep(wl);
+ 
+ out:
+ 	mutex_unlock(&wl->mutex);
+ 	return count;
+ }
+ 
+ static const struct file_operations dynamic_ps_timeout_ops = {
+ 	.read = dynamic_ps_timeout_read,
+ 	.write = dynamic_ps_timeout_write,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static ssize_t forced_ps_read(struct file *file, char __user *user_buf,
+ 			  size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 
+ 	return wl1271_format_buffer(user_buf, count,
+ 				    ppos, "%d\n",
+ 				    wl->conf.conn.forced_ps);
+ }
+ 
+ static ssize_t forced_ps_write(struct file *file,
+ 				    const char __user *user_buf,
+ 				    size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	struct wl12xx_vif *wlvif;
+ 	unsigned long value;
+ 	int ret, ps_mode;
+ 
+ 	ret = kstrtoul_from_user(user_buf, count, 10, &value);
+ 	if (ret < 0) {
+ 		wl1271_warning("illegal value in forced_ps");
+ 		return -EINVAL;
+ 	}
+ 
+ 	if (value != 1 && value != 0) {
+ 		wl1271_warning("forced_ps should be either 0 or 1");
+ 		return -ERANGE;
+ 	}
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ 	if (wl->conf.conn.forced_ps == value)
+ 		goto out;
+ 
+ 	wl->conf.conn.forced_ps = value;
+ 
+ 	if (wl->state == WL1271_STATE_OFF)
+ 		goto out;
+ 
+ 	ret = wl1271_ps_elp_wakeup(wl);
+ 	if (ret < 0)
+ 		goto out;
+ 
+ 	/* In case we're already in PSM, trigger it again to switch mode
+ 	 * immediately without waiting for re-association
+ 	 */
+ 
+ 	ps_mode = value ? STATION_POWER_SAVE_MODE : STATION_AUTO_PS_MODE;
+ 
+ 	wl12xx_for_each_wlvif_sta(wl, wlvif) {
+ 		if (test_bit(WLVIF_FLAG_IN_PS, &wlvif->flags))
+ 			wl1271_ps_set_mode(wl, wlvif, ps_mode);
+ 	}
+ 
+ 	wl1271_ps_elp_sleep(wl);
+ 
+ out:
+ 	mutex_unlock(&wl->mutex);
+ 	return count;
+ }
+ 
+ static const struct file_operations forced_ps_ops = {
+ 	.read = forced_ps_read,
+ 	.write = forced_ps_write,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static ssize_t split_scan_timeout_read(struct file *file, char __user *user_buf,
+ 			  size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 
+ 	return wl1271_format_buffer(user_buf, count,
+ 				    ppos, "%d\n",
+ 				    wl->conf.scan.split_scan_timeout / 1000);
+ }
+ 
+ static ssize_t split_scan_timeout_write(struct file *file,
+ 				    const char __user *user_buf,
+ 				    size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	unsigned long value;
+ 	int ret;
+ 
+ 	ret = kstrtoul_from_user(user_buf, count, 10, &value);
+ 	if (ret < 0) {
+ 		wl1271_warning("illegal value in split_scan_timeout");
+ 		return -EINVAL;
+ 	}
+ 
+ 	if (value == 0)
+ 		wl1271_info("split scan will be disabled");
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ 	wl->conf.scan.split_scan_timeout = value * 1000;
+ 
+ 	mutex_unlock(&wl->mutex);
+ 	return count;
+ }
+ 
+ static const struct file_operations split_scan_timeout_ops = {
+ 	.read = split_scan_timeout_read,
+ 	.write = split_scan_timeout_write,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static ssize_t driver_state_read(struct file *file, char __user *user_buf,
+ 				 size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	int res = 0;
+ 	ssize_t ret;
+ 	char *buf;
+ 
+ #define DRIVER_STATE_BUF_LEN 1024
+ 
+ 	buf = kmalloc(DRIVER_STATE_BUF_LEN, GFP_KERNEL);
+ 	if (!buf)
+ 		return -ENOMEM;
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ #define DRIVER_STATE_PRINT(x, fmt)   \
+ 	(res += scnprintf(buf + res, DRIVER_STATE_BUF_LEN - res,\
+ 			  #x " = " fmt "\n", wl->x))
+ 
+ #define DRIVER_STATE_PRINT_LONG(x) DRIVER_STATE_PRINT(x, "%ld")
+ #define DRIVER_STATE_PRINT_INT(x)  DRIVER_STATE_PRINT(x, "%d")
+ #define DRIVER_STATE_PRINT_STR(x)  DRIVER_STATE_PRINT(x, "%s")
+ #define DRIVER_STATE_PRINT_LHEX(x) DRIVER_STATE_PRINT(x, "0x%lx")
+ #define DRIVER_STATE_PRINT_HEX(x)  DRIVER_STATE_PRINT(x, "0x%x")
+ 
+ 	DRIVER_STATE_PRINT_INT(tx_blocks_available);
+ 	DRIVER_STATE_PRINT_INT(tx_allocated_blocks);
+ 	DRIVER_STATE_PRINT_INT(tx_allocated_pkts[0]);
+ 	DRIVER_STATE_PRINT_INT(tx_allocated_pkts[1]);
+ 	DRIVER_STATE_PRINT_INT(tx_allocated_pkts[2]);
+ 	DRIVER_STATE_PRINT_INT(tx_allocated_pkts[3]);
+ 	DRIVER_STATE_PRINT_INT(tx_frames_cnt);
+ 	DRIVER_STATE_PRINT_LHEX(tx_frames_map[0]);
+ 	DRIVER_STATE_PRINT_INT(tx_queue_count[0]);
+ 	DRIVER_STATE_PRINT_INT(tx_queue_count[1]);
+ 	DRIVER_STATE_PRINT_INT(tx_queue_count[2]);
+ 	DRIVER_STATE_PRINT_INT(tx_queue_count[3]);
+ 	DRIVER_STATE_PRINT_INT(tx_packets_count);
+ 	DRIVER_STATE_PRINT_INT(tx_results_count);
+ 	DRIVER_STATE_PRINT_LHEX(flags);
+ 	DRIVER_STATE_PRINT_INT(tx_blocks_freed);
+ 	DRIVER_STATE_PRINT_INT(rx_counter);
+ 	DRIVER_STATE_PRINT_INT(state);
+ 	DRIVER_STATE_PRINT_INT(channel);
+ 	DRIVER_STATE_PRINT_INT(band);
+ 	DRIVER_STATE_PRINT_INT(power_level);
+ 	DRIVER_STATE_PRINT_INT(sg_enabled);
+ 	DRIVER_STATE_PRINT_INT(enable_11a);
+ 	DRIVER_STATE_PRINT_INT(noise);
+ 	DRIVER_STATE_PRINT_HEX(ap_fw_ps_map);
+ 	DRIVER_STATE_PRINT_LHEX(ap_ps_map);
+ 	DRIVER_STATE_PRINT_HEX(quirks);
+ 	DRIVER_STATE_PRINT_HEX(irq);
+ 	DRIVER_STATE_PRINT_HEX(ref_clock);
+ 	DRIVER_STATE_PRINT_HEX(tcxo_clock);
+ 	DRIVER_STATE_PRINT_HEX(hw_pg_ver);
+ 	DRIVER_STATE_PRINT_HEX(platform_quirks);
+ 	DRIVER_STATE_PRINT_HEX(chip.id);
+ 	DRIVER_STATE_PRINT_STR(chip.fw_ver_str);
+ 	DRIVER_STATE_PRINT_INT(sched_scanning);
+ 
+ #undef DRIVER_STATE_PRINT_INT
+ #undef DRIVER_STATE_PRINT_LONG
+ #undef DRIVER_STATE_PRINT_HEX
+ #undef DRIVER_STATE_PRINT_LHEX
+ #undef DRIVER_STATE_PRINT_STR
+ #undef DRIVER_STATE_PRINT
+ #undef DRIVER_STATE_BUF_LEN
+ 
+ 	mutex_unlock(&wl->mutex);
+ 
+ 	ret = simple_read_from_buffer(user_buf, count, ppos, buf, res);
+ 	kfree(buf);
+ 	return ret;
+ }
+ 
+ static const struct file_operations driver_state_ops = {
+ 	.read = driver_state_read,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static ssize_t vifs_state_read(struct file *file, char __user *user_buf,
+ 				 size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	struct wl12xx_vif *wlvif;
+ 	int ret, res = 0;
+ 	const int buf_size = 4096;
+ 	char *buf;
+ 	char tmp_buf[64];
+ 
+ 	buf = kzalloc(buf_size, GFP_KERNEL);
+ 	if (!buf)
+ 		return -ENOMEM;
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ #define VIF_STATE_PRINT(x, fmt)				\
+ 	(res += scnprintf(buf + res, buf_size - res,	\
+ 			  #x " = " fmt "\n", wlvif->x))
+ 
+ #define VIF_STATE_PRINT_LONG(x)  VIF_STATE_PRINT(x, "%ld")
+ #define VIF_STATE_PRINT_INT(x)   VIF_STATE_PRINT(x, "%d")
+ #define VIF_STATE_PRINT_STR(x)   VIF_STATE_PRINT(x, "%s")
+ #define VIF_STATE_PRINT_LHEX(x)  VIF_STATE_PRINT(x, "0x%lx")
+ #define VIF_STATE_PRINT_LLHEX(x) VIF_STATE_PRINT(x, "0x%llx")
+ #define VIF_STATE_PRINT_HEX(x)   VIF_STATE_PRINT(x, "0x%x")
+ 
+ #define VIF_STATE_PRINT_NSTR(x, len)				\
+ 	do {							\
+ 		memset(tmp_buf, 0, sizeof(tmp_buf));		\
+ 		memcpy(tmp_buf, wlvif->x,			\
+ 		       min_t(u8, len, sizeof(tmp_buf) - 1));	\
+ 		res += scnprintf(buf + res, buf_size - res,	\
+ 				 #x " = %s\n", tmp_buf);	\
+ 	} while (0)
+ 
+ 	wl12xx_for_each_wlvif(wl, wlvif) {
+ 		VIF_STATE_PRINT_INT(role_id);
+ 		VIF_STATE_PRINT_INT(bss_type);
+ 		VIF_STATE_PRINT_LHEX(flags);
+ 		VIF_STATE_PRINT_INT(p2p);
+ 		VIF_STATE_PRINT_INT(dev_role_id);
+ 		VIF_STATE_PRINT_INT(dev_hlid);
+ 
+ 		if (wlvif->bss_type == BSS_TYPE_STA_BSS ||
+ 		    wlvif->bss_type == BSS_TYPE_IBSS) {
+ 			VIF_STATE_PRINT_INT(sta.hlid);
+ 			VIF_STATE_PRINT_INT(sta.ba_rx_bitmap);
+ 			VIF_STATE_PRINT_INT(sta.basic_rate_idx);
+ 			VIF_STATE_PRINT_INT(sta.ap_rate_idx);
+ 			VIF_STATE_PRINT_INT(sta.p2p_rate_idx);
+ 			VIF_STATE_PRINT_INT(sta.qos);
+ 		} else {
+ 			VIF_STATE_PRINT_INT(ap.global_hlid);
+ 			VIF_STATE_PRINT_INT(ap.bcast_hlid);
+ 			VIF_STATE_PRINT_LHEX(ap.sta_hlid_map[0]);
+ 			VIF_STATE_PRINT_INT(ap.mgmt_rate_idx);
+ 			VIF_STATE_PRINT_INT(ap.bcast_rate_idx);
+ 			VIF_STATE_PRINT_INT(ap.ucast_rate_idx[0]);
+ 			VIF_STATE_PRINT_INT(ap.ucast_rate_idx[1]);
+ 			VIF_STATE_PRINT_INT(ap.ucast_rate_idx[2]);
+ 			VIF_STATE_PRINT_INT(ap.ucast_rate_idx[3]);
+ 		}
+ 		VIF_STATE_PRINT_INT(last_tx_hlid);
+ 		VIF_STATE_PRINT_LHEX(links_map[0]);
+ 		VIF_STATE_PRINT_NSTR(ssid, wlvif->ssid_len);
+ 		VIF_STATE_PRINT_INT(band);
+ 		VIF_STATE_PRINT_INT(channel);
+ 		VIF_STATE_PRINT_HEX(bitrate_masks[0]);
+ 		VIF_STATE_PRINT_HEX(bitrate_masks[1]);
+ 		VIF_STATE_PRINT_HEX(basic_rate_set);
+ 		VIF_STATE_PRINT_HEX(basic_rate);
+ 		VIF_STATE_PRINT_HEX(rate_set);
+ 		VIF_STATE_PRINT_INT(beacon_int);
+ 		VIF_STATE_PRINT_INT(default_key);
+ 		VIF_STATE_PRINT_INT(aid);
+ 		VIF_STATE_PRINT_INT(session_counter);
+ 		VIF_STATE_PRINT_INT(psm_entry_retry);
+ 		VIF_STATE_PRINT_INT(power_level);
+ 		VIF_STATE_PRINT_INT(rssi_thold);
+ 		VIF_STATE_PRINT_INT(last_rssi_event);
+ 		VIF_STATE_PRINT_INT(ba_support);
+ 		VIF_STATE_PRINT_INT(ba_allowed);
+ 		VIF_STATE_PRINT_INT(is_gem);
+ 		VIF_STATE_PRINT_LLHEX(tx_security_seq);
+ 		VIF_STATE_PRINT_INT(tx_security_last_seq_lsb);
+ 	}
+ 
+ #undef VIF_STATE_PRINT_INT
+ #undef VIF_STATE_PRINT_LONG
+ #undef VIF_STATE_PRINT_HEX
+ #undef VIF_STATE_PRINT_LHEX
+ #undef VIF_STATE_PRINT_LLHEX
+ #undef VIF_STATE_PRINT_STR
+ #undef VIF_STATE_PRINT_NSTR
+ #undef VIF_STATE_PRINT
+ 
+ 	mutex_unlock(&wl->mutex);
+ 
+ 	ret = simple_read_from_buffer(user_buf, count, ppos, buf, res);
+ 	kfree(buf);
+ 	return ret;
+ }
+ 
+ static const struct file_operations vifs_state_ops = {
+ 	.read = vifs_state_read,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static ssize_t dtim_interval_read(struct file *file, char __user *user_buf,
+ 				  size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	u8 value;
+ 
+ 	if (wl->conf.conn.wake_up_event == CONF_WAKE_UP_EVENT_DTIM ||
+ 	    wl->conf.conn.wake_up_event == CONF_WAKE_UP_EVENT_N_DTIM)
+ 		value = wl->conf.conn.listen_interval;
+ 	else
+ 		value = 0;
+ 
+ 	return wl1271_format_buffer(user_buf, count, ppos, "%d\n", value);
+ }
+ 
+ static ssize_t dtim_interval_write(struct file *file,
+ 				   const char __user *user_buf,
+ 				   size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	unsigned long value;
+ 	int ret;
+ 
+ 	ret = kstrtoul_from_user(user_buf, count, 10, &value);
+ 	if (ret < 0) {
+ 		wl1271_warning("illegal value for dtim_interval");
+ 		return -EINVAL;
+ 	}
+ 
+ 	if (value < 1 || value > 10) {
+ 		wl1271_warning("dtim value is not in valid range");
+ 		return -ERANGE;
+ 	}
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ 	wl->conf.conn.listen_interval = value;
+ 	/* for some reason there are different event types for 1 and >1 */
+ 	if (value == 1)
+ 		wl->conf.conn.wake_up_event = CONF_WAKE_UP_EVENT_DTIM;
+ 	else
+ 		wl->conf.conn.wake_up_event = CONF_WAKE_UP_EVENT_N_DTIM;
+ 
+ 	/*
+ 	 * we don't reconfigure ACX_WAKE_UP_CONDITIONS now, so it will only
+ 	 * take effect on the next time we enter psm.
+ 	 */
+ 	mutex_unlock(&wl->mutex);
+ 	return count;
+ }
+ 
+ static const struct file_operations dtim_interval_ops = {
+ 	.read = dtim_interval_read,
+ 	.write = dtim_interval_write,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ 
+ 
+ static ssize_t suspend_dtim_interval_read(struct file *file,
+ 					  char __user *user_buf,
+ 					  size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	u8 value;
+ 
+ 	if (wl->conf.conn.suspend_wake_up_event == CONF_WAKE_UP_EVENT_DTIM ||
+ 	    wl->conf.conn.suspend_wake_up_event == CONF_WAKE_UP_EVENT_N_DTIM)
+ 		value = wl->conf.conn.suspend_listen_interval;
+ 	else
+ 		value = 0;
+ 
+ 	return wl1271_format_buffer(user_buf, count, ppos, "%d\n", value);
+ }
+ 
+ static ssize_t suspend_dtim_interval_write(struct file *file,
+ 					   const char __user *user_buf,
+ 					   size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	unsigned long value;
+ 	int ret;
+ 
+ 	ret = kstrtoul_from_user(user_buf, count, 10, &value);
+ 	if (ret < 0) {
+ 		wl1271_warning("illegal value for suspend_dtim_interval");
+ 		return -EINVAL;
+ 	}
+ 
+ 	if (value < 1 || value > 10) {
+ 		wl1271_warning("suspend_dtim value is not in valid range");
+ 		return -ERANGE;
+ 	}
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ 	wl->conf.conn.suspend_listen_interval = value;
+ 	/* for some reason there are different event types for 1 and >1 */
+ 	if (value == 1)
+ 		wl->conf.conn.suspend_wake_up_event = CONF_WAKE_UP_EVENT_DTIM;
+ 	else
+ 		wl->conf.conn.suspend_wake_up_event = CONF_WAKE_UP_EVENT_N_DTIM;
+ 
+ 	mutex_unlock(&wl->mutex);
+ 	return count;
+ }
+ 
+ 
+ static const struct file_operations suspend_dtim_interval_ops = {
+ 	.read = suspend_dtim_interval_read,
+ 	.write = suspend_dtim_interval_write,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static ssize_t beacon_interval_read(struct file *file, char __user *user_buf,
+ 				    size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	u8 value;
+ 
+ 	if (wl->conf.conn.wake_up_event == CONF_WAKE_UP_EVENT_BEACON ||
+ 	    wl->conf.conn.wake_up_event == CONF_WAKE_UP_EVENT_N_BEACONS)
+ 		value = wl->conf.conn.listen_interval;
+ 	else
+ 		value = 0;
+ 
+ 	return wl1271_format_buffer(user_buf, count, ppos, "%d\n", value);
+ }
+ 
+ static ssize_t beacon_interval_write(struct file *file,
+ 				     const char __user *user_buf,
+ 				     size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	unsigned long value;
+ 	int ret;
+ 
+ 	ret = kstrtoul_from_user(user_buf, count, 10, &value);
+ 	if (ret < 0) {
+ 		wl1271_warning("illegal value for beacon_interval");
+ 		return -EINVAL;
+ 	}
+ 
+ 	if (value < 1 || value > 255) {
+ 		wl1271_warning("beacon interval value is not in valid range");
+ 		return -ERANGE;
+ 	}
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ 	wl->conf.conn.listen_interval = value;
+ 	/* for some reason there are different event types for 1 and >1 */
+ 	if (value == 1)
+ 		wl->conf.conn.wake_up_event = CONF_WAKE_UP_EVENT_BEACON;
+ 	else
+ 		wl->conf.conn.wake_up_event = CONF_WAKE_UP_EVENT_N_BEACONS;
+ 
+ 	/*
+ 	 * we don't reconfigure ACX_WAKE_UP_CONDITIONS now, so it will only
+ 	 * take effect on the next time we enter psm.
+ 	 */
+ 	mutex_unlock(&wl->mutex);
+ 	return count;
+ }
+ 
+ static const struct file_operations beacon_interval_ops = {
+ 	.read = beacon_interval_read,
+ 	.write = beacon_interval_write,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static ssize_t rx_streaming_interval_write(struct file *file,
+ 			   const char __user *user_buf,
+ 			   size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	struct wl12xx_vif *wlvif;
+ 	unsigned long value;
+ 	int ret;
+ 
+ 	ret = kstrtoul_from_user(user_buf, count, 10, &value);
+ 	if (ret < 0) {
+ 		wl1271_warning("illegal value in rx_streaming_interval!");
+ 		return -EINVAL;
+ 	}
+ 
+ 	/* valid values: 0, 10-100 */
+ 	if (value && (value < 10 || value > 100)) {
+ 		wl1271_warning("value is not in range!");
+ 		return -ERANGE;
+ 	}
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ 	wl->conf.rx_streaming.interval = value;
+ 
+ 	ret = wl1271_ps_elp_wakeup(wl);
+ 	if (ret < 0)
+ 		goto out;
+ 
+ 	wl12xx_for_each_wlvif_sta(wl, wlvif) {
+ 		wl1271_recalc_rx_streaming(wl, wlvif);
+ 	}
+ 
+ 	wl1271_ps_elp_sleep(wl);
+ out:
+ 	mutex_unlock(&wl->mutex);
+ 	return count;
+ }
+ 
+ static ssize_t rx_streaming_interval_read(struct file *file,
+ 			    char __user *userbuf,
+ 			    size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	return wl1271_format_buffer(userbuf, count, ppos,
+ 				    "%d\n", wl->conf.rx_streaming.interval);
+ }
+ 
+ static const struct file_operations rx_streaming_interval_ops = {
+ 	.read = rx_streaming_interval_read,
+ 	.write = rx_streaming_interval_write,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static ssize_t rx_streaming_always_write(struct file *file,
+ 			   const char __user *user_buf,
+ 			   size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	struct wl12xx_vif *wlvif;
+ 	unsigned long value;
+ 	int ret;
+ 
+ 	ret = kstrtoul_from_user(user_buf, count, 10, &value);
+ 	if (ret < 0) {
+ 		wl1271_warning("illegal value in rx_streaming_write!");
+ 		return -EINVAL;
+ 	}
+ 
+ 	/* valid values: 0, 10-100 */
+ 	if (!(value == 0 || value == 1)) {
+ 		wl1271_warning("value is not in valid!");
+ 		return -EINVAL;
+ 	}
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ 	wl->conf.rx_streaming.always = value;
+ 
+ 	ret = wl1271_ps_elp_wakeup(wl);
+ 	if (ret < 0)
+ 		goto out;
+ 
+ 	wl12xx_for_each_wlvif_sta(wl, wlvif) {
+ 		wl1271_recalc_rx_streaming(wl, wlvif);
+ 	}
+ 
+ 	wl1271_ps_elp_sleep(wl);
+ out:
+ 	mutex_unlock(&wl->mutex);
+ 	return count;
+ }
+ 
+ static ssize_t rx_streaming_always_read(struct file *file,
+ 			    char __user *userbuf,
+ 			    size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	return wl1271_format_buffer(userbuf, count, ppos,
+ 				    "%d\n", wl->conf.rx_streaming.always);
+ }
+ 
+ static const struct file_operations rx_streaming_always_ops = {
+ 	.read = rx_streaming_always_read,
+ 	.write = rx_streaming_always_write,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static ssize_t beacon_filtering_write(struct file *file,
+ 				      const char __user *user_buf,
+ 				      size_t count, loff_t *ppos)
+ {
+ 	struct wl1271 *wl = file->private_data;
+ 	struct wl12xx_vif *wlvif;
+ 	char buf[10];
+ 	size_t len;
+ 	unsigned long value;
+ 	int ret;
+ 
+ 	len = min(count, sizeof(buf) - 1);
+ 	if (copy_from_user(buf, user_buf, len))
+ 		return -EFAULT;
+ 	buf[len] = '\0';
+ 
+ 	ret = kstrtoul(buf, 0, &value);
+ 	if (ret < 0) {
+ 		wl1271_warning("illegal value for beacon_filtering!");
+ 		return -EINVAL;
+ 	}
+ 
+ 	mutex_lock(&wl->mutex);
+ 
+ 	ret = wl1271_ps_elp_wakeup(wl);
+ 	if (ret < 0)
+ 		goto out;
+ 
+ 	wl12xx_for_each_wlvif(wl, wlvif) {
+ 		ret = wl1271_acx_beacon_filter_opt(wl, wlvif, !!value);
+ 	}
+ 
+ 	wl1271_ps_elp_sleep(wl);
+ out:
+ 	mutex_unlock(&wl->mutex);
+ 	return count;
+ }
+ 
+ static const struct file_operations beacon_filtering_ops = {
+ 	.write = beacon_filtering_write,
 -	.open = wl1271_open_file_generic,
++	.open = simple_open,
+ 	.llseek = default_llseek,
+ };
+ 
+ static int wl1271_debugfs_add_files(struct wl1271 *wl,
+ 				     struct dentry *rootdir)
+ {
+ 	int ret = 0;
+ 	struct dentry *entry, *stats, *streaming;
+ 
+ 	stats = debugfs_create_dir("fw-statistics", rootdir);
+ 	if (!stats || IS_ERR(stats)) {
+ 		entry = stats;
+ 		goto err;
+ 	}
+ 
+ 	DEBUGFS_FWSTATS_ADD(tx, internal_desc_overflow);
+ 
+ 	DEBUGFS_FWSTATS_ADD(rx, out_of_mem);
+ 	DEBUGFS_FWSTATS_ADD(rx, hdr_overflow);
+ 	DEBUGFS_FWSTATS_ADD(rx, hw_stuck);
+ 	DEBUGFS_FWSTATS_ADD(rx, dropped);
+ 	DEBUGFS_FWSTATS_ADD(rx, fcs_err);
+ 	DEBUGFS_FWSTATS_ADD(rx, xfr_hint_trig);
+ 	DEBUGFS_FWSTATS_ADD(rx, path_reset);
+ 	DEBUGFS_FWSTATS_ADD(rx, reset_counter);
+ 
+ 	DEBUGFS_FWSTATS_ADD(dma, rx_requested);
+ 	DEBUGFS_FWSTATS_ADD(dma, rx_errors);
+ 	DEBUGFS_FWSTATS_ADD(dma, tx_requested);
+ 	DEBUGFS_FWSTATS_ADD(dma, tx_errors);
+ 
+ 	DEBUGFS_FWSTATS_ADD(isr, cmd_cmplt);
+ 	DEBUGFS_FWSTATS_ADD(isr, fiqs);
+ 	DEBUGFS_FWSTATS_ADD(isr, rx_headers);
+ 	DEBUGFS_FWSTATS_ADD(isr, rx_mem_overflow);
+ 	DEBUGFS_FWSTATS_ADD(isr, rx_rdys);
+ 	DEBUGFS_FWSTATS_ADD(isr, irqs);
+ 	DEBUGFS_FWSTATS_ADD(isr, tx_procs);
+ 	DEBUGFS_FWSTATS_ADD(isr, decrypt_done);
+ 	DEBUGFS_FWSTATS_ADD(isr, dma0_done);
+ 	DEBUGFS_FWSTATS_ADD(isr, dma1_done);
+ 	DEBUGFS_FWSTATS_ADD(isr, tx_exch_complete);
+ 	DEBUGFS_FWSTATS_ADD(isr, commands);
+ 	DEBUGFS_FWSTATS_ADD(isr, rx_procs);
+ 	DEBUGFS_FWSTATS_ADD(isr, hw_pm_mode_changes);
+ 	DEBUGFS_FWSTATS_ADD(isr, host_acknowledges);
+ 	DEBUGFS_FWSTATS_ADD(isr, pci_pm);
+ 	DEBUGFS_FWSTATS_ADD(isr, wakeups);
+ 	DEBUGFS_FWSTATS_ADD(isr, low_rssi);
+ 
+ 	DEBUGFS_FWSTATS_ADD(wep, addr_key_count);
+ 	DEBUGFS_FWSTATS_ADD(wep, default_key_count);
+ 	/* skipping wep.reserved */
+ 	DEBUGFS_FWSTATS_ADD(wep, key_not_found);
+ 	DEBUGFS_FWSTATS_ADD(wep, decrypt_fail);
+ 	DEBUGFS_FWSTATS_ADD(wep, packets);
+ 	DEBUGFS_FWSTATS_ADD(wep, interrupt);
+ 
+ 	DEBUGFS_FWSTATS_ADD(pwr, ps_enter);
+ 	DEBUGFS_FWSTATS_ADD(pwr, elp_enter);
+ 	DEBUGFS_FWSTATS_ADD(pwr, missing_bcns);
+ 	DEBUGFS_FWSTATS_ADD(pwr, wake_on_host);
+ 	DEBUGFS_FWSTATS_ADD(pwr, wake_on_timer_exp);
+ 	DEBUGFS_FWSTATS_ADD(pwr, tx_with_ps);
+ 	DEBUGFS_FWSTATS_ADD(pwr, tx_without_ps);
+ 	DEBUGFS_FWSTATS_ADD(pwr, rcvd_beacons);
+ 	DEBUGFS_FWSTATS_ADD(pwr, power_save_off);
+ 	DEBUGFS_FWSTATS_ADD(pwr, enable_ps);
+ 	DEBUGFS_FWSTATS_ADD(pwr, disable_ps);
+ 	DEBUGFS_FWSTATS_ADD(pwr, fix_tsf_ps);
+ 	/* skipping cont_miss_bcns_spread for now */
+ 	DEBUGFS_FWSTATS_ADD(pwr, rcvd_awake_beacons);
+ 
+ 	DEBUGFS_FWSTATS_ADD(mic, rx_pkts);
+ 	DEBUGFS_FWSTATS_ADD(mic, calc_failure);
+ 
+ 	DEBUGFS_FWSTATS_ADD(aes, encrypt_fail);
+ 	DEBUGFS_FWSTATS_ADD(aes, decrypt_fail);
+ 	DEBUGFS_FWSTATS_ADD(aes, encrypt_packets);
+ 	DEBUGFS_FWSTATS_ADD(aes, decrypt_packets);
+ 	DEBUGFS_FWSTATS_ADD(aes, encrypt_interrupt);
+ 	DEBUGFS_FWSTATS_ADD(aes, decrypt_interrupt);
+ 
+ 	DEBUGFS_FWSTATS_ADD(event, heart_beat);
+ 	DEBUGFS_FWSTATS_ADD(event, calibration);
+ 	DEBUGFS_FWSTATS_ADD(event, rx_mismatch);
+ 	DEBUGFS_FWSTATS_ADD(event, rx_mem_empty);
+ 	DEBUGFS_FWSTATS_ADD(event, rx_pool);
+ 	DEBUGFS_FWSTATS_ADD(event, oom_late);
+ 	DEBUGFS_FWSTATS_ADD(event, phy_transmit_error);
+ 	DEBUGFS_FWSTATS_ADD(event, tx_stuck);
+ 
+ 	DEBUGFS_FWSTATS_ADD(ps, pspoll_timeouts);
+ 	DEBUGFS_FWSTATS_ADD(ps, upsd_timeouts);
+ 	DEBUGFS_FWSTATS_ADD(ps, upsd_max_sptime);
+ 	DEBUGFS_FWSTATS_ADD(ps, upsd_max_apturn);
+ 	DEBUGFS_FWSTATS_ADD(ps, pspoll_max_apturn);
+ 	DEBUGFS_FWSTATS_ADD(ps, pspoll_utilization);
+ 	DEBUGFS_FWSTATS_ADD(ps, upsd_utilization);
+ 
+ 	DEBUGFS_FWSTATS_ADD(rxpipe, rx_prep_beacon_drop);
+ 	DEBUGFS_FWSTATS_ADD(rxpipe, descr_host_int_trig_rx_data);
+ 	DEBUGFS_FWSTATS_ADD(rxpipe, beacon_buffer_thres_host_int_trig_rx_data);
+ 	DEBUGFS_FWSTATS_ADD(rxpipe, missed_beacon_host_int_trig_rx_data);
+ 	DEBUGFS_FWSTATS_ADD(rxpipe, tx_xfr_host_int_trig_rx_data);
+ 
+ 	DEBUGFS_ADD(tx_queue_len, rootdir);
+ 	DEBUGFS_ADD(retry_count, rootdir);
+ 	DEBUGFS_ADD(excessive_retries, rootdir);
+ 
+ 	DEBUGFS_ADD(gpio_power, rootdir);
+ 	DEBUGFS_ADD(start_recovery, rootdir);
+ 	DEBUGFS_ADD(driver_state, rootdir);
+ 	DEBUGFS_ADD(vifs_state, rootdir);
+ 	DEBUGFS_ADD(dtim_interval, rootdir);
+ 	DEBUGFS_ADD(suspend_dtim_interval, rootdir);
+ 	DEBUGFS_ADD(beacon_interval, rootdir);
+ 	DEBUGFS_ADD(beacon_filtering, rootdir);
+ 	DEBUGFS_ADD(dynamic_ps_timeout, rootdir);
+ 	DEBUGFS_ADD(forced_ps, rootdir);
+ 	DEBUGFS_ADD(split_scan_timeout, rootdir);
+ 
+ 	streaming = debugfs_create_dir("rx_streaming", rootdir);
+ 	if (!streaming || IS_ERR(streaming))
+ 		goto err;
+ 
+ 	DEBUGFS_ADD_PREFIX(rx_streaming, interval, streaming);
+ 	DEBUGFS_ADD_PREFIX(rx_streaming, always, streaming);
+ 
+ 
+ 	return 0;
+ 
+ err:
+ 	if (IS_ERR(entry))
+ 		ret = PTR_ERR(entry);
+ 	else
+ 		ret = -ENOMEM;
+ 
+ 	return ret;
+ }
+ 
+ void wl1271_debugfs_reset(struct wl1271 *wl)
+ {
+ 	if (!wl->stats.fw_stats)
+ 		return;
+ 
+ 	memset(wl->stats.fw_stats, 0, sizeof(*wl->stats.fw_stats));
+ 	wl->stats.retry_count = 0;
+ 	wl->stats.excessive_retries = 0;
+ }
+ 
+ int wl1271_debugfs_init(struct wl1271 *wl)
+ {
+ 	int ret;
+ 	struct dentry *rootdir;
+ 
+ 	rootdir = debugfs_create_dir(KBUILD_MODNAME,
+ 				     wl->hw->wiphy->debugfsdir);
+ 
+ 	if (IS_ERR(rootdir)) {
+ 		ret = PTR_ERR(rootdir);
+ 		goto err;
+ 	}
+ 
+ 	wl->stats.fw_stats = kzalloc(sizeof(*wl->stats.fw_stats),
+ 				      GFP_KERNEL);
+ 
+ 	if (!wl->stats.fw_stats) {
+ 		ret = -ENOMEM;
+ 		goto err_fw;
+ 	}
+ 
+ 	wl->stats.fw_stats_update = jiffies;
+ 
+ 	ret = wl1271_debugfs_add_files(wl, rootdir);
+ 
+ 	if (ret < 0)
+ 		goto err_file;
+ 
+ 	return 0;
+ 
+ err_file:
+ 	kfree(wl->stats.fw_stats);
+ 	wl->stats.fw_stats = NULL;
+ 
+ err_fw:
+ 	debugfs_remove_recursive(rootdir);
+ 
+ err:
+ 	return ret;
+ }
+ 
+ void wl1271_debugfs_exit(struct wl1271 *wl)
+ {
+ 	kfree(wl->stats.fw_stats);
+ 	wl->stats.fw_stats = NULL;
+ }