Commit 6556ff32 authored by Taehee Yoo's avatar Taehee Yoo Committed by Jakub Kicinski
Browse files

netdevsim: use IS_ERR instead of IS_ERR_OR_NULL for debugfs 



Debugfs APIs return valid pointer or error pointer. it doesn't return NULL.
So, using IS_ERR is enough, not using IS_ERR_OR_NULL.

Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarTaehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6fb8852b

drivers/net/netdevsim/bpf.c

+6 −4
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ static int nsim_bpf_create_prog(struct nsim_dev *nsim_dev, 
{

	struct nsim_bpf_bound_prog *state;

	char name[16];

	int ret;



	state = kzalloc(sizeof(*state), GFP_KERNEL);

	if (!state)
@@ -230,9 +231,10 @@ static int nsim_bpf_create_prog(struct nsim_dev *nsim_dev, 
	/* Program id is not populated yet when we create the state. */

	sprintf(name, "%u", nsim_dev->prog_id_gen++);

	state->ddir = debugfs_create_dir(name, nsim_dev->ddir_bpf_bound_progs);

	if (IS_ERR_OR_NULL(state->ddir)) {

	if (IS_ERR(state->ddir)) {

		ret = PTR_ERR(state->ddir);

		kfree(state);

		return -ENOMEM;

		return ret;

	}



	debugfs_create_u32("id", 0400, state->ddir, &prog->aux->id);
@@ -587,8 +589,8 @@ int nsim_bpf_dev_init(struct nsim_dev *nsim_dev) 


	nsim_dev->ddir_bpf_bound_progs = debugfs_create_dir("bpf_bound_progs",

							    nsim_dev->ddir);

	if (IS_ERR_OR_NULL(nsim_dev->ddir_bpf_bound_progs))

		return -ENOMEM;

	if (IS_ERR(nsim_dev->ddir_bpf_bound_progs))

		return PTR_ERR(nsim_dev->ddir_bpf_bound_progs);



	nsim_dev->bpf_dev = bpf_offload_dev_create(&nsim_bpf_dev_ops, nsim_dev);

	err = PTR_ERR_OR_ZERO(nsim_dev->bpf_dev);

drivers/net/netdevsim/dev.c

+8 −8
Original line number Diff line number Diff line
@@ -77,11 +77,11 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev) 


	sprintf(dev_ddir_name, DRV_NAME "%u", nsim_dev->nsim_bus_dev->dev.id);

	nsim_dev->ddir = debugfs_create_dir(dev_ddir_name, nsim_dev_ddir);

	if (IS_ERR_OR_NULL(nsim_dev->ddir))

		return PTR_ERR_OR_ZERO(nsim_dev->ddir) ?: -EINVAL;

	if (IS_ERR(nsim_dev->ddir))

		return PTR_ERR(nsim_dev->ddir);

	nsim_dev->ports_ddir = debugfs_create_dir("ports", nsim_dev->ddir);

	if (IS_ERR_OR_NULL(nsim_dev->ports_ddir))

		return PTR_ERR_OR_ZERO(nsim_dev->ports_ddir) ?: -EINVAL;

	if (IS_ERR(nsim_dev->ports_ddir))

		return PTR_ERR(nsim_dev->ports_ddir);

	debugfs_create_bool("fw_update_status", 0600, nsim_dev->ddir,

			    &nsim_dev->fw_update_status);

	debugfs_create_u32("max_macs", 0600, nsim_dev->ddir,
@@ -115,8 +115,8 @@ static int nsim_dev_port_debugfs_init(struct nsim_dev *nsim_dev, 
	sprintf(port_ddir_name, "%u", nsim_dev_port->port_index);

	nsim_dev_port->ddir = debugfs_create_dir(port_ddir_name,

						 nsim_dev->ports_ddir);

	if (IS_ERR_OR_NULL(nsim_dev_port->ddir))

		return -ENOMEM;

	if (IS_ERR(nsim_dev_port->ddir))

		return PTR_ERR(nsim_dev_port->ddir);



	sprintf(dev_link_name, "../../../" DRV_NAME "%u",

		nsim_dev->nsim_bus_dev->dev.id);
@@ -934,8 +934,8 @@ int nsim_dev_port_del(struct nsim_bus_dev *nsim_bus_dev, 
int nsim_dev_init(void)

{

	nsim_dev_ddir = debugfs_create_dir(DRV_NAME, NULL);

	if (IS_ERR_OR_NULL(nsim_dev_ddir))

		return -ENOMEM;

	if (IS_ERR(nsim_dev_ddir))

		return PTR_ERR(nsim_dev_ddir);

	return 0;

}

drivers/net/netdevsim/health.c

+2 −2
Original line number Diff line number Diff line
@@ -285,8 +285,8 @@ int nsim_dev_health_init(struct nsim_dev *nsim_dev, struct devlink *devlink) 
	}



	health->ddir = debugfs_create_dir("health", nsim_dev->ddir);

	if (IS_ERR_OR_NULL(health->ddir)) {

		err = PTR_ERR_OR_ZERO(health->ddir) ?: -EINVAL;

	if (IS_ERR(health->ddir)) {

		err = PTR_ERR(health->ddir);

		goto err_dummy_reporter_destroy;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE