rt2x00: Move register value/offset files into new folder
Cleanup debugfs interface by moving the csr/bbp/rf/eeprom value/offset entries into the "register" folder. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
David S. Miller

parent
49da2605e2
commit
91921a4e9b
@@ -53,7 +53,8 @@ struct rt2x00debug_intf {
|
|||||||
* - driver file
|
* - driver file
|
||||||
* - chipset file
|
* - chipset file
|
||||||
* - device flags file
|
* - device flags file
|
||||||
* - register offset/value files
|
* - register folder
|
||||||
|
* - csr offset/value files
|
||||||
* - eeprom offset/value files
|
* - eeprom offset/value files
|
||||||
* - bbp offset/value files
|
* - bbp offset/value files
|
||||||
* - rf offset/value files
|
* - rf offset/value files
|
||||||
@@ -62,6 +63,7 @@ struct rt2x00debug_intf {
|
|||||||
struct dentry *driver_entry;
|
struct dentry *driver_entry;
|
||||||
struct dentry *chipset_entry;
|
struct dentry *chipset_entry;
|
||||||
struct dentry *dev_flags;
|
struct dentry *dev_flags;
|
||||||
|
struct dentry *register_folder;
|
||||||
struct dentry *csr_off_entry;
|
struct dentry *csr_off_entry;
|
||||||
struct dentry *csr_val_entry;
|
struct dentry *csr_val_entry;
|
||||||
struct dentry *eeprom_off_entry;
|
struct dentry *eeprom_off_entry;
|
||||||
@@ -301,12 +303,17 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
|
|||||||
if (IS_ERR(intf->dev_flags))
|
if (IS_ERR(intf->dev_flags))
|
||||||
goto exit;
|
goto exit;
|
||||||
|
|
||||||
#define RT2X00DEBUGFS_CREATE_ENTRY(__intf, __name) \
|
intf->register_folder =
|
||||||
|
debugfs_create_dir("register", intf->driver_folder);
|
||||||
|
if (IS_ERR(intf->register_folder))
|
||||||
|
goto exit;
|
||||||
|
|
||||||
|
#define RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(__intf, __name) \
|
||||||
({ \
|
({ \
|
||||||
(__intf)->__name##_off_entry = \
|
(__intf)->__name##_off_entry = \
|
||||||
debugfs_create_u32(__stringify(__name) "_offset", \
|
debugfs_create_u32(__stringify(__name) "_offset", \
|
||||||
S_IRUGO | S_IWUSR, \
|
S_IRUGO | S_IWUSR, \
|
||||||
(__intf)->driver_folder, \
|
(__intf)->register_folder, \
|
||||||
&(__intf)->offset_##__name); \
|
&(__intf)->offset_##__name); \
|
||||||
if (IS_ERR((__intf)->__name##_off_entry)) \
|
if (IS_ERR((__intf)->__name##_off_entry)) \
|
||||||
goto exit; \
|
goto exit; \
|
||||||
@@ -314,18 +321,18 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
|
|||||||
(__intf)->__name##_val_entry = \
|
(__intf)->__name##_val_entry = \
|
||||||
debugfs_create_file(__stringify(__name) "_value", \
|
debugfs_create_file(__stringify(__name) "_value", \
|
||||||
S_IRUGO | S_IWUSR, \
|
S_IRUGO | S_IWUSR, \
|
||||||
(__intf)->driver_folder, \
|
(__intf)->register_folder, \
|
||||||
(__intf), &rt2x00debug_fop_##__name);\
|
(__intf), &rt2x00debug_fop_##__name);\
|
||||||
if (IS_ERR((__intf)->__name##_val_entry)) \
|
if (IS_ERR((__intf)->__name##_val_entry)) \
|
||||||
goto exit; \
|
goto exit; \
|
||||||
})
|
})
|
||||||
|
|
||||||
RT2X00DEBUGFS_CREATE_ENTRY(intf, csr);
|
RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(intf, csr);
|
||||||
RT2X00DEBUGFS_CREATE_ENTRY(intf, eeprom);
|
RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(intf, eeprom);
|
||||||
RT2X00DEBUGFS_CREATE_ENTRY(intf, bbp);
|
RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(intf, bbp);
|
||||||
RT2X00DEBUGFS_CREATE_ENTRY(intf, rf);
|
RT2X00DEBUGFS_CREATE_REGISTER_ENTRY(intf, rf);
|
||||||
|
|
||||||
#undef RT2X00DEBUGFS_CREATE_ENTRY
|
#undef RT2X00DEBUGFS_CREATE_REGISTER_ENTRY
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -351,6 +358,7 @@ void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)
|
|||||||
debugfs_remove(intf->eeprom_off_entry);
|
debugfs_remove(intf->eeprom_off_entry);
|
||||||
debugfs_remove(intf->csr_val_entry);
|
debugfs_remove(intf->csr_val_entry);
|
||||||
debugfs_remove(intf->csr_off_entry);
|
debugfs_remove(intf->csr_off_entry);
|
||||||
|
debugfs_remove(intf->register_folder);
|
||||||
debugfs_remove(intf->dev_flags);
|
debugfs_remove(intf->dev_flags);
|
||||||
debugfs_remove(intf->chipset_entry);
|
debugfs_remove(intf->chipset_entry);
|
||||||
debugfs_remove(intf->driver_entry);
|
debugfs_remove(intf->driver_entry);
|
||||||
|
Reference in New Issue
Block a user