Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69e72801 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files

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: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 4b3e8062

drivers/net/wireless/iwlwifi/iwl-agn.c

+0 −39
Original line number Original line Diff line number Diff line
@@ -3177,44 +3177,6 @@ static ssize_t store_tx_power(struct device *d, 




static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO, show_tx_power, store_tx_power);

static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO, show_tx_power, store_tx_power);





static ssize_t show_statistics(struct device *d,

			       struct device_attribute *attr, char *buf)

{

	struct iwl_priv *priv = dev_get_drvdata(d);

	u32 size = sizeof(struct iwl_notif_statistics);

	u32 len = 0, ofs = 0;

	u8 *data = (u8 *)&priv->statistics;

	int rc = 0;



	if (!iwl_is_alive(priv))

		return -EAGAIN;



	mutex_lock(&priv->mutex);

	rc = iwl_send_statistics_request(priv, CMD_SYNC, false);

	mutex_unlock(&priv->mutex);



	if (rc) {

		len = sprintf(buf,

			      "Error sending statistics request: 0x%08X\n", rc);

		return len;

	}



	while (size && (PAGE_SIZE - len)) {

		hex_dump_to_buffer(data + ofs, size, 16, 1, buf + len,

				   PAGE_SIZE - len, 1);

		len = strlen(buf);

		if (PAGE_SIZE - len)

			buf[len++] = '\n';



		ofs += 16;

		size -= min(size, 16U);

	}



	return len;

}



static DEVICE_ATTR(statistics, S_IRUGO, show_statistics, NULL);



static ssize_t show_rts_ht_protection(struct device *d,

static ssize_t show_rts_ht_protection(struct device *d,

			     struct device_attribute *attr, char *buf)

			     struct device_attribute *attr, char *buf)

{

{
@@ -3404,7 +3366,6 @@ static void iwl_uninit_drv(struct iwl_priv *priv) 
}

}





static struct attribute *iwl_sysfs_entries[] = {

static struct attribute *iwl_sysfs_entries[] = {

	&dev_attr_statistics.attr,

	&dev_attr_temperature.attr,

	&dev_attr_temperature.attr,

	&dev_attr_tx_power.attr,

	&dev_attr_tx_power.attr,

	&dev_attr_rts_ht_protection.attr,

	&dev_attr_rts_ht_protection.attr,

drivers/net/wireless/iwlwifi/iwl3945-base.c

+0 −39
Original line number Original line Diff line number Diff line
@@ -3657,44 +3657,6 @@ static ssize_t show_channels(struct device *d, 




static DEVICE_ATTR(channels, S_IRUSR, show_channels, NULL);

static DEVICE_ATTR(channels, S_IRUSR, show_channels, NULL);





static ssize_t show_statistics(struct device *d,

			       struct device_attribute *attr, char *buf)

{

	struct iwl_priv *priv = dev_get_drvdata(d);

	u32 size = sizeof(struct iwl3945_notif_statistics);

	u32 len = 0, ofs = 0;

	u8 *data = (u8 *)&priv->_3945.statistics;

	int rc = 0;



	if (!iwl_is_alive(priv))

		return -EAGAIN;



	mutex_lock(&priv->mutex);

	rc = iwl_send_statistics_request(priv, CMD_SYNC, false);

	mutex_unlock(&priv->mutex);



	if (rc) {

		len = sprintf(buf,

			      "Error sending statistics request: 0x%08X\n", rc);

		return len;

	}



	while (size && (PAGE_SIZE - len)) {

		hex_dump_to_buffer(data + ofs, size, 16, 1, buf + len,

				   PAGE_SIZE - len, 1);

		len = strlen(buf);

		if (PAGE_SIZE - len)

			buf[len++] = '\n';



		ofs += 16;

		size -= min(size, 16U);

	}



	return len;

}



static DEVICE_ATTR(statistics, S_IRUGO, show_statistics, NULL);



static ssize_t show_antenna(struct device *d,

static ssize_t show_antenna(struct device *d,

			    struct device_attribute *attr, char *buf)

			    struct device_attribute *attr, char *buf)

{

{
@@ -3814,7 +3776,6 @@ static struct attribute *iwl3945_sysfs_entries[] = { 
	&dev_attr_filter_flags.attr,

	&dev_attr_filter_flags.attr,

	&dev_attr_measurement.attr,

	&dev_attr_measurement.attr,

	&dev_attr_retry_rate.attr,

	&dev_attr_retry_rate.attr,

	&dev_attr_statistics.attr,

	&dev_attr_status.attr,

	&dev_attr_status.attr,

	&dev_attr_temperature.attr,

	&dev_attr_temperature.attr,

	&dev_attr_tx_power.attr,

	&dev_attr_tx_power.attr,