Commit 49d2a8af authored by Oded Gabbay's avatar Oded Gabbay Committed by Greg Kroah-Hartman
Browse files

habanalabs: use NULL for eventfd 



eventfd is pointer. As such, it should be initialized to NULL, not to 0.

In addition, no need to initialize it after creation because the
entire structure is zeroed-out. Also, no need to initialize it before
release because the entire structure is freed.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 368b0b4f

drivers/misc/habanalabs/common/device.c

+2 −6
Original line number Diff line number Diff line
@@ -286,10 +286,8 @@ static void hpriv_release(struct kref *ref) 
	hdev->compute_ctx_in_release = 0;



	/* release the eventfd */

	if (hpriv->notifier_event.eventfd) {

	if (hpriv->notifier_event.eventfd)

		eventfd_ctx_put(hpriv->notifier_event.eventfd);

		hpriv->notifier_event.eventfd = 0;

	}



	mutex_destroy(&hpriv->notifier_event.lock);
@@ -364,10 +362,8 @@ static int hl_device_release_ctrl(struct inode *inode, struct file *filp) 
	mutex_unlock(&hdev->fpriv_ctrl_list_lock);

out:

	/* release the eventfd */

	if (hpriv->notifier_event.eventfd) {

	if (hpriv->notifier_event.eventfd)

		eventfd_ctx_put(hpriv->notifier_event.eventfd);

		hpriv->notifier_event.eventfd = 0;

	}



	mutex_destroy(&hpriv->notifier_event.lock);

	put_pid(hpriv->taskpid);

drivers/misc/habanalabs/common/habanalabs_drv.c

+0 −4
Original line number Diff line number Diff line
@@ -134,8 +134,6 @@ int hl_device_open(struct inode *inode, struct file *filp) 
	hpriv->hdev = hdev;

	filp->private_data = hpriv;

	hpriv->filp = filp;

	hpriv->notifier_event.events_mask = 0;

	hpriv->notifier_event.eventfd = 0;



	mutex_init(&hpriv->notifier_event.lock);

	mutex_init(&hpriv->restore_phase_mutex);
@@ -246,8 +244,6 @@ int hl_device_open_ctrl(struct inode *inode, struct file *filp) 
	hpriv->hdev = hdev;

	filp->private_data = hpriv;

	hpriv->filp = filp;

	hpriv->notifier_event.events_mask = 0;

	hpriv->notifier_event.eventfd = 0;



	mutex_init(&hpriv->notifier_event.lock);

	nonseekable_open(inode, filp);

drivers/misc/habanalabs/common/habanalabs_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static int eventfd_register(struct hl_fpriv *hpriv, struct hl_info_args *args) 
	hpriv->notifier_event.eventfd = eventfd_ctx_fdget(args->eventfd);

	if (IS_ERR(hpriv->notifier_event.eventfd)) {

		rc = PTR_ERR(hpriv->notifier_event.eventfd);

		hpriv->notifier_event.eventfd = 0;

		hpriv->notifier_event.eventfd = NULL;

		mutex_unlock(&hpriv->notifier_event.lock);

		return rc;

	}
@@ -665,7 +665,7 @@ static int eventfd_unregister(struct hl_fpriv *hpriv, struct hl_info_args *args) 
	}



	eventfd_ctx_put(hpriv->notifier_event.eventfd);

	hpriv->notifier_event.eventfd = 0;

	hpriv->notifier_event.eventfd = NULL;

	mutex_unlock(&hpriv->notifier_event.lock);

	return 0;

}