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

Commit 9b5e2f46 authored by Greg Dietsche's avatar Greg Dietsche Committed by Stanislaw Gruszka
Browse files

iwlegacy: debugfs_ops should depend on CONFIG_IWLEGACY_DEBUGFS 



Only setup structs related to debugfs_ops when CONFIG_IWLEGACY_DEBUGFS is set.

Signed-off-by: default avatarGreg Dietsche <Gregory.Dietsche@cuw.edu>
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
parent e3a2c775

drivers/net/wireless/iwlegacy/3945.c

+2 −0
Original line number Diff line number Diff line
@@ -2671,11 +2671,13 @@ static struct il_lib_ops il3945_lib = { 
	.send_tx_power = il3945_send_tx_power,

	.is_valid_rtc_data_addr = il3945_hw_valid_rtc_data_addr,



#ifdef CONFIG_IWLEGACY_DEBUGFS

	.debugfs_ops = {

			.rx_stats_read = il3945_ucode_rx_stats_read,

			.tx_stats_read = il3945_ucode_tx_stats_read,

			.general_stats_read = il3945_ucode_general_stats_read,

			},

#endif

};



static const struct il_legacy_ops il3945_legacy_ops = {

drivers/net/wireless/iwlegacy/3945.h

+0 −21
Original line number Diff line number Diff line
@@ -621,27 +621,6 @@ ssize_t il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf, 
ssize_t il3945_ucode_general_stats_read(struct file *file,

					char __user *user_buf, size_t count,

					loff_t *ppos);

#else

static ssize_t

il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,

			   size_t count, loff_t *ppos)

{

	return 0;

}



static ssize_t

il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,

			   size_t count, loff_t *ppos)

{

	return 0;

}



static ssize_t

il3945_ucode_general_stats_read(struct file *file, char __user *user_buf,

				size_t count, loff_t *ppos)

{

	return 0;

}

#endif



#endif

drivers/net/wireless/iwlegacy/4965.c

+2 −0
Original line number Diff line number Diff line
@@ -2333,11 +2333,13 @@ static struct il_lib_ops il4965_lib = { 
	.temp_ops = {

		     .temperature = il4965_temperature_calib,

		     },

#ifdef CONFIG_IWLEGACY_DEBUGFS

	.debugfs_ops = {

			.rx_stats_read = il4965_ucode_rx_stats_read,

			.tx_stats_read = il4965_ucode_tx_stats_read,

			.general_stats_read = il4965_ucode_general_stats_read,

			},

#endif

};



static const struct il_legacy_ops il4965_legacy_ops = {

drivers/net/wireless/iwlegacy/4965.h

+0 −21
Original line number Diff line number Diff line
@@ -956,27 +956,6 @@ ssize_t il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf, 
ssize_t il4965_ucode_general_stats_read(struct file *file,

					char __user *user_buf, size_t count,

					loff_t *ppos);

#else

static ssize_t

il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,

			   size_t count, loff_t *ppos)

{

	return 0;

}



static ssize_t

il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,

			   size_t count, loff_t *ppos)

{

	return 0;

}



static ssize_t

il4965_ucode_general_stats_read(struct file *file, char __user *user_buf,

				size_t count, loff_t *ppos)

{

	return 0;

}

#endif



/****************************/

drivers/net/wireless/iwlegacy/common.h

+4 −0
Original line number Diff line number Diff line
@@ -1631,6 +1631,7 @@ struct il_apm_ops { 
	void (*config) (struct il_priv *il);

};



#ifdef CONFIG_IWLEGACY_DEBUGFS

struct il_debugfs_ops {

	ssize_t(*rx_stats_read) (struct file *file, char __user *user_buf,

				 size_t count, loff_t *ppos);
@@ -1640,6 +1641,7 @@ struct il_debugfs_ops { 
				      char __user *user_buf, size_t count,

				      loff_t *ppos);

};

#endif



struct il_temp_ops {

	void (*temperature) (struct il_priv *il);
@@ -1683,7 +1685,9 @@ struct il_lib_ops { 
	/* temperature */

	struct il_temp_ops temp_ops;



#ifdef CONFIG_IWLEGACY_DEBUGFS

	struct il_debugfs_ops debugfs_ops;

#endif



};