|
@@ -473,45 +473,31 @@ static void pkt_debugfs_dev_new(struct pktcdvd_device *pd)
|
|
|
{
|
|
|
if (!pkt_debugfs_root)
|
|
|
return;
|
|
|
- pd->dfs_f_info = NULL;
|
|
|
pd->dfs_d_root = debugfs_create_dir(pd->name, pkt_debugfs_root);
|
|
|
- if (IS_ERR(pd->dfs_d_root)) {
|
|
|
- pd->dfs_d_root = NULL;
|
|
|
+ if (!pd->dfs_d_root)
|
|
|
return;
|
|
|
- }
|
|
|
+
|
|
|
pd->dfs_f_info = debugfs_create_file("info", S_IRUGO,
|
|
|
pd->dfs_d_root, pd, &debug_fops);
|
|
|
- if (IS_ERR(pd->dfs_f_info)) {
|
|
|
- pd->dfs_f_info = NULL;
|
|
|
- return;
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
static void pkt_debugfs_dev_remove(struct pktcdvd_device *pd)
|
|
|
{
|
|
|
if (!pkt_debugfs_root)
|
|
|
return;
|
|
|
- if (pd->dfs_f_info)
|
|
|
- debugfs_remove(pd->dfs_f_info);
|
|
|
+ debugfs_remove(pd->dfs_f_info);
|
|
|
+ debugfs_remove(pd->dfs_d_root);
|
|
|
pd->dfs_f_info = NULL;
|
|
|
- if (pd->dfs_d_root)
|
|
|
- debugfs_remove(pd->dfs_d_root);
|
|
|
pd->dfs_d_root = NULL;
|
|
|
}
|
|
|
|
|
|
static void pkt_debugfs_init(void)
|
|
|
{
|
|
|
pkt_debugfs_root = debugfs_create_dir(DRIVER_NAME, NULL);
|
|
|
- if (IS_ERR(pkt_debugfs_root)) {
|
|
|
- pkt_debugfs_root = NULL;
|
|
|
- return;
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
static void pkt_debugfs_cleanup(void)
|
|
|
{
|
|
|
- if (!pkt_debugfs_root)
|
|
|
- return;
|
|
|
debugfs_remove(pkt_debugfs_root);
|
|
|
pkt_debugfs_root = NULL;
|
|
|
}
|