Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 16:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

iwlegacy: debugfs_ops should depend on CONFIG_IWLEGACY_DEBUGFS

Browse Source 
Only setup structs related to debugfs_ops when CONFIG_IWLEGACY_DEBUGFS is set.

Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
This commit is contained in:
Greg Dietsche 2011-09-06 19:11:35 -05:00 committed by Stanislaw Gruszka
parent e3a2c77533
commit 9b5e2f463a
5 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlegacy/3945.c
View File

@ -2671,11 +2671,13 @@ static struct il_lib_ops il3945_lib = {
.send_tx_power = il3945_send_tx_power, .send_tx_power = il3945_send_tx_power,
.is_valid_rtc_data_addr = il3945_hw_valid_rtc_data_addr, .is_valid_rtc_data_addr = il3945_hw_valid_rtc_data_addr,
#ifdef CONFIG_IWLEGACY_DEBUGFS
.debugfs_ops = { .debugfs_ops = {
.rx_stats_read = il3945_ucode_rx_stats_read, .rx_stats_read = il3945_ucode_rx_stats_read,
.tx_stats_read = il3945_ucode_tx_stats_read, .tx_stats_read = il3945_ucode_tx_stats_read,
.general_stats_read = il3945_ucode_general_stats_read, .general_stats_read = il3945_ucode_general_stats_read,
}, },
#endif
}; };
static const struct il_legacy_ops il3945_legacy_ops = { static const struct il_legacy_ops il3945_legacy_ops = {

21
drivers/net/wireless/iwlegacy/3945.h
View File

@ -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, ssize_t il3945_ucode_general_stats_read(struct file *file,
char __user *user_buf, size_t count, char __user *user_buf, size_t count,
loff_t *ppos); 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
#endif #endif

2
drivers/net/wireless/iwlegacy/4965.c
View File

@ -2333,11 +2333,13 @@ static struct il_lib_ops il4965_lib = {
.temp_ops = { .temp_ops = {
.temperature = il4965_temperature_calib, .temperature = il4965_temperature_calib,
}, },
#ifdef CONFIG_IWLEGACY_DEBUGFS
.debugfs_ops = { .debugfs_ops = {
.rx_stats_read = il4965_ucode_rx_stats_read, .rx_stats_read = il4965_ucode_rx_stats_read,
.tx_stats_read = il4965_ucode_tx_stats_read, .tx_stats_read = il4965_ucode_tx_stats_read,
.general_stats_read = il4965_ucode_general_stats_read, .general_stats_read = il4965_ucode_general_stats_read,
}, },
#endif
}; };
static const struct il_legacy_ops il4965_legacy_ops = { static const struct il_legacy_ops il4965_legacy_ops = {

21
drivers/net/wireless/iwlegacy/4965.h
View File

@ -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, ssize_t il4965_ucode_general_stats_read(struct file *file,
char __user *user_buf, size_t count, char __user *user_buf, size_t count,
loff_t *ppos); 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 #endif
/****************************/ /****************************/

4
drivers/net/wireless/iwlegacy/common.h
View File

@ -1631,6 +1631,7 @@ struct il_apm_ops {
void (*config) (struct il_priv *il); void (*config) (struct il_priv *il);
}; };
#ifdef CONFIG_IWLEGACY_DEBUGFS
struct il_debugfs_ops { struct il_debugfs_ops {
ssize_t(*rx_stats_read) (struct file *file, char __user *user_buf, ssize_t(*rx_stats_read) (struct file *file, char __user *user_buf,
size_t count, loff_t *ppos); size_t count, loff_t *ppos);
@ -1640,6 +1641,7 @@ struct il_debugfs_ops {
char __user *user_buf, size_t count, char __user *user_buf, size_t count,
loff_t *ppos); loff_t *ppos);
}; };
#endif
struct il_temp_ops { struct il_temp_ops {
void (*temperature) (struct il_priv *il); void (*temperature) (struct il_priv *il);
@ -1683,7 +1685,9 @@ struct il_lib_ops {
/* temperature */ /* temperature */
struct il_temp_ops temp_ops; struct il_temp_ops temp_ops;
#ifdef CONFIG_IWLEGACY_DEBUGFS
struct il_debugfs_ops debugfs_ops; struct il_debugfs_ops debugfs_ops;
#endif
}; };