Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'bna-remove-error-checking-for-debugfs-create-apis'
Zhen Lei says:
====================
bna: Remove error checking for debugfs create APIs
1. Fix the incorrect return value check for debugfs_create_dir() and
debugfs_create_file(), which returns ERR_PTR(-ERROR) instead of NULL
when it fails.
2. Remove field bnad_dentry_files[] in struct bnad. When a directory is
deleted, files in the directory are automatically deleted. Therefore,
there is need to record these files.
====================
Link: https://patch.msgid.link/20241028020943.507-1-thunder.leizhen@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+5
-27
-1
drivers/net/ethernet/brocade/bna/bnad.h
-1
drivers/net/ethernet/brocade/bna/bnad.h
+5
-26
drivers/net/ethernet/brocade/bna/bnad_debugfs.c
+5
-26
drivers/net/ethernet/brocade/bna/bnad_debugfs.c
···
500
500
if (!bna_debugfs_root) {
501
501
bna_debugfs_root = debugfs_create_dir("bna", NULL);
502
502
atomic_set(&bna_debugfs_port_count, 0);
503
-
if (!bna_debugfs_root) {
504
-
netdev_warn(bnad->netdev,
505
-
"debugfs root dir creation failed\n");
506
-
return;
507
-
}
508
503
}
509
504
510
505
/* Setup the pci_dev debugfs directory for the port */
···
512
517
513
518
for (i = 0; i < ARRAY_SIZE(bnad_debugfs_files); i++) {
514
519
file = &bnad_debugfs_files[i];
515
-
bnad->bnad_dentry_files[i] =
516
-
debugfs_create_file(file->name,
517
-
file->mode,
518
-
bnad->port_debugfs_root,
519
-
bnad,
520
-
file->fops);
521
-
if (!bnad->bnad_dentry_files[i]) {
522
-
netdev_warn(bnad->netdev,
523
-
"create %s entry failed\n",
524
-
file->name);
525
-
return;
526
-
}
520
+
debugfs_create_file(file->name,
521
+
file->mode,
522
+
bnad->port_debugfs_root,
523
+
bnad,
524
+
file->fops);
527
525
}
528
526
}
529
527
}
···
525
537
void
526
538
bnad_debugfs_uninit(struct bnad *bnad)
527
539
{
528
-
int i;
529
-
530
-
for (i = 0; i < ARRAY_SIZE(bnad_debugfs_files); i++) {
531
-
if (bnad->bnad_dentry_files[i]) {
532
-
debugfs_remove(bnad->bnad_dentry_files[i]);
533
-
bnad->bnad_dentry_files[i] = NULL;
534
-
}
535
-
}
536
-
537
540
/* Remove the pci_dev debugfs directory for the port */
538
541
if (bnad->port_debugfs_root) {
539
542
debugfs_remove(bnad->port_debugfs_root);