Commit a3c1185e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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: default avatarJakub Kicinski <kuba@kernel.org>
parents bd03e762 67826db3

drivers/net/ethernet/brocade/bna/bnad.h

+0 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ struct bnad { 
	/* debugfs specific data */

	char	*regdata;

	u32	reglen;

	struct dentry *bnad_dentry_files[5];

	struct dentry *port_debugfs_root;

};

drivers/net/ethernet/brocade/bna/bnad_debugfs.c

+5 −26
Original line number Diff line number Diff line
@@ -500,11 +500,6 @@ bnad_debugfs_init(struct bnad *bnad) 
	if (!bna_debugfs_root) {

		bna_debugfs_root = debugfs_create_dir("bna", NULL);

		atomic_set(&bna_debugfs_port_count, 0);

		if (!bna_debugfs_root) {

			netdev_warn(bnad->netdev,

				    "debugfs root dir creation failed\n");

			return;

		}

	}



	/* Setup the pci_dev debugfs directory for the port */
@@ -517,18 +512,11 @@ bnad_debugfs_init(struct bnad *bnad) 


		for (i = 0; i < ARRAY_SIZE(bnad_debugfs_files); i++) {

			file = &bnad_debugfs_files[i];

			bnad->bnad_dentry_files[i] =

			debugfs_create_file(file->name,

					    file->mode,

					    bnad->port_debugfs_root,

					    bnad,

					    file->fops);

			if (!bnad->bnad_dentry_files[i]) {

				netdev_warn(bnad->netdev,

					    "create %s entry failed\n",

					    file->name);

				return;

			}

		}

	}

}
@@ -537,15 +525,6 @@ bnad_debugfs_init(struct bnad *bnad) 
void

bnad_debugfs_uninit(struct bnad *bnad)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(bnad_debugfs_files); i++) {

		if (bnad->bnad_dentry_files[i]) {

			debugfs_remove(bnad->bnad_dentry_files[i]);

			bnad->bnad_dentry_files[i] = NULL;

		}

	}



	/* Remove the pci_dev debugfs directory for the port */

	if (bnad->port_debugfs_root) {

		debugfs_remove(bnad->port_debugfs_root);