浏览代码

iwlwifi: remove forward debugfs function declarations

There's no need to have 'forward' debugfs function declarations
as part of the macros because the macros are always used after
the static functions are defined already, so remove them.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Johannes Berg 12 年之前
父节点
当前提交
2be01fa8f5
共有 2 个文件被更改,包括 0 次插入29 次删除
  1. 0 15
      drivers/net/wireless/iwlwifi/dvm/debugfs.c
  2. 0 14
      drivers/net/wireless/iwlwifi/pcie/trans.c

+ 0 - 15
drivers/net/wireless/iwlwifi/dvm/debugfs.c

@@ -69,19 +69,7 @@
 } while (0)
 } while (0)
 
 
 /* file operation */
 /* file operation */
-#define DEBUGFS_READ_FUNC(name)                                         \
-static ssize_t iwl_dbgfs_##name##_read(struct file *file,               \
-					char __user *user_buf,          \
-					size_t count, loff_t *ppos);
-
-#define DEBUGFS_WRITE_FUNC(name)                                        \
-static ssize_t iwl_dbgfs_##name##_write(struct file *file,              \
-					const char __user *user_buf,    \
-					size_t count, loff_t *ppos);
-
-
 #define DEBUGFS_READ_FILE_OPS(name)                                     \
 #define DEBUGFS_READ_FILE_OPS(name)                                     \
-	DEBUGFS_READ_FUNC(name);                                        \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 	.read = iwl_dbgfs_##name##_read,				\
 	.read = iwl_dbgfs_##name##_read,				\
 	.open = simple_open,						\
 	.open = simple_open,						\
@@ -89,7 +77,6 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 };
 };
 
 
 #define DEBUGFS_WRITE_FILE_OPS(name)                                    \
 #define DEBUGFS_WRITE_FILE_OPS(name)                                    \
-	DEBUGFS_WRITE_FUNC(name);                                       \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 	.write = iwl_dbgfs_##name##_write,                              \
 	.write = iwl_dbgfs_##name##_write,                              \
 	.open = simple_open,						\
 	.open = simple_open,						\
@@ -98,8 +85,6 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 
 
 
 
 #define DEBUGFS_READ_WRITE_FILE_OPS(name)                               \
 #define DEBUGFS_READ_WRITE_FILE_OPS(name)                               \
-	DEBUGFS_READ_FUNC(name);                                        \
-	DEBUGFS_WRITE_FUNC(name);                                       \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 	.write = iwl_dbgfs_##name##_write,                              \
 	.write = iwl_dbgfs_##name##_write,                              \
 	.read = iwl_dbgfs_##name##_read,                                \
 	.read = iwl_dbgfs_##name##_read,                                \

+ 0 - 14
drivers/net/wireless/iwlwifi/pcie/trans.c

@@ -1113,18 +1113,7 @@ void iwl_pcie_dump_csr(struct iwl_trans *trans)
 } while (0)
 } while (0)
 
 
 /* file operation */
 /* file operation */
-#define DEBUGFS_READ_FUNC(name)                                         \
-static ssize_t iwl_dbgfs_##name##_read(struct file *file,               \
-					char __user *user_buf,          \
-					size_t count, loff_t *ppos);
-
-#define DEBUGFS_WRITE_FUNC(name)                                        \
-static ssize_t iwl_dbgfs_##name##_write(struct file *file,              \
-					const char __user *user_buf,    \
-					size_t count, loff_t *ppos);
-
 #define DEBUGFS_READ_FILE_OPS(name)					\
 #define DEBUGFS_READ_FILE_OPS(name)					\
-	DEBUGFS_READ_FUNC(name);					\
 static const struct file_operations iwl_dbgfs_##name##_ops = {		\
 static const struct file_operations iwl_dbgfs_##name##_ops = {		\
 	.read = iwl_dbgfs_##name##_read,				\
 	.read = iwl_dbgfs_##name##_read,				\
 	.open = simple_open,						\
 	.open = simple_open,						\
@@ -1132,7 +1121,6 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {		\
 };
 };
 
 
 #define DEBUGFS_WRITE_FILE_OPS(name)                                    \
 #define DEBUGFS_WRITE_FILE_OPS(name)                                    \
-	DEBUGFS_WRITE_FUNC(name);                                       \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 	.write = iwl_dbgfs_##name##_write,                              \
 	.write = iwl_dbgfs_##name##_write,                              \
 	.open = simple_open,						\
 	.open = simple_open,						\
@@ -1140,8 +1128,6 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 };
 };
 
 
 #define DEBUGFS_READ_WRITE_FILE_OPS(name)				\
 #define DEBUGFS_READ_WRITE_FILE_OPS(name)				\
-	DEBUGFS_READ_FUNC(name);					\
-	DEBUGFS_WRITE_FUNC(name);					\
 static const struct file_operations iwl_dbgfs_##name##_ops = {		\
 static const struct file_operations iwl_dbgfs_##name##_ops = {		\
 	.write = iwl_dbgfs_##name##_write,				\
 	.write = iwl_dbgfs_##name##_write,				\
 	.read = iwl_dbgfs_##name##_read,				\
 	.read = iwl_dbgfs_##name##_read,				\