aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-04-07 23:12:23 -0400
committerReinette Chatre <reinette.chatre@intel.com>2010-04-16 16:48:29 -0400
commit69e72801224693bb520cf3ece5e6bf67f0448c96 (patch)
tree33b81498aec7cd04c79e8bf32e5b10bcbda71a95 /drivers
parent4b3e8062807822271e02aafc0432e9a2497cb46c (diff)
iwlwifi: remove duplicated debug functions
Use the show uCode statistics function for uCode debugging purposes only; it is being duplicated in both debugfs and sysfs. remove the one from sysfs. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c39
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c39
2 files changed, 0 insertions, 78 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index e788722c23ab..8ac154680af1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3177,44 +3177,6 @@ static ssize_t store_tx_power(struct device *d,
3177 3177
3178static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO, show_tx_power, store_tx_power); 3178static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO, show_tx_power, store_tx_power);
3179 3179
3180static ssize_t show_statistics(struct device *d,
3181 struct device_attribute *attr, char *buf)
3182{
3183 struct iwl_priv *priv = dev_get_drvdata(d);
3184 u32 size = sizeof(struct iwl_notif_statistics);
3185 u32 len = 0, ofs = 0;
3186 u8 *data = (u8 *)&priv->statistics;
3187 int rc = 0;
3188
3189 if (!iwl_is_alive(priv))
3190 return -EAGAIN;
3191
3192 mutex_lock(&priv->mutex);
3193 rc = iwl_send_statistics_request(priv, CMD_SYNC, false);
3194 mutex_unlock(&priv->mutex);
3195
3196 if (rc) {
3197 len = sprintf(buf,
3198 "Error sending statistics request: 0x%08X\n", rc);
3199 return len;
3200 }
3201
3202 while (size && (PAGE_SIZE - len)) {
3203 hex_dump_to_buffer(data + ofs, size, 16, 1, buf + len,
3204 PAGE_SIZE - len, 1);
3205 len = strlen(buf);
3206 if (PAGE_SIZE - len)
3207 buf[len++] = '\n';
3208
3209 ofs += 16;
3210 size -= min(size, 16U);
3211 }
3212
3213 return len;
3214}
3215
3216static DEVICE_ATTR(statistics, S_IRUGO, show_statistics, NULL);
3217
3218static ssize_t show_rts_ht_protection(struct device *d, 3180static ssize_t show_rts_ht_protection(struct device *d,
3219 struct device_attribute *attr, char *buf) 3181 struct device_attribute *attr, char *buf)
3220{ 3182{
@@ -3404,7 +3366,6 @@ static void iwl_uninit_drv(struct iwl_priv *priv)
3404} 3366}
3405 3367
3406static struct attribute *iwl_sysfs_entries[] = { 3368static struct attribute *iwl_sysfs_entries[] = {
3407 &dev_attr_statistics.attr,
3408 &dev_attr_temperature.attr, 3369 &dev_attr_temperature.attr,
3409 &dev_attr_tx_power.attr, 3370 &dev_attr_tx_power.attr,
3410 &dev_attr_rts_ht_protection.attr, 3371 &dev_attr_rts_ht_protection.attr,
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 06004d03f20b..8da3375b603b 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -3657,44 +3657,6 @@ static ssize_t show_channels(struct device *d,
3657 3657
3658static DEVICE_ATTR(channels, S_IRUSR, show_channels, NULL); 3658static DEVICE_ATTR(channels, S_IRUSR, show_channels, NULL);
3659 3659
3660static ssize_t show_statistics(struct device *d,
3661 struct device_attribute *attr, char *buf)
3662{
3663 struct iwl_priv *priv = dev_get_drvdata(d);
3664 u32 size = sizeof(struct iwl3945_notif_statistics);
3665 u32 len = 0, ofs = 0;
3666 u8 *data = (u8 *)&priv->_3945.statistics;
3667 int rc = 0;
3668
3669 if (!iwl_is_alive(priv))
3670 return -EAGAIN;
3671
3672 mutex_lock(&priv->mutex);
3673 rc = iwl_send_statistics_request(priv, CMD_SYNC, false);
3674 mutex_unlock(&priv->mutex);
3675
3676 if (rc) {
3677 len = sprintf(buf,
3678 "Error sending statistics request: 0x%08X\n", rc);
3679 return len;
3680 }
3681
3682 while (size && (PAGE_SIZE - len)) {
3683 hex_dump_to_buffer(data + ofs, size, 16, 1, buf + len,
3684 PAGE_SIZE - len, 1);
3685 len = strlen(buf);
3686 if (PAGE_SIZE - len)
3687 buf[len++] = '\n';
3688
3689 ofs += 16;
3690 size -= min(size, 16U);
3691 }
3692
3693 return len;
3694}
3695
3696static DEVICE_ATTR(statistics, S_IRUGO, show_statistics, NULL);
3697
3698static ssize_t show_antenna(struct device *d, 3660static ssize_t show_antenna(struct device *d,
3699 struct device_attribute *attr, char *buf) 3661 struct device_attribute *attr, char *buf)
3700{ 3662{
@@ -3814,7 +3776,6 @@ static struct attribute *iwl3945_sysfs_entries[] = {
3814 &dev_attr_filter_flags.attr, 3776 &dev_attr_filter_flags.attr,
3815 &dev_attr_measurement.attr, 3777 &dev_attr_measurement.attr,
3816 &dev_attr_retry_rate.attr, 3778 &dev_attr_retry_rate.attr,
3817 &dev_attr_statistics.attr,
3818 &dev_attr_status.attr, 3779 &dev_attr_status.attr,
3819 &dev_attr_temperature.attr, 3780 &dev_attr_temperature.attr,
3820 &dev_attr_tx_power.attr, 3781 &dev_attr_tx_power.attr,