[media] staging: easycap: Clean comment style in easycap_usb_disconnect() (cf32b65d) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/staging/media/easycap/easycap_main.c

+24 −40

Original line number	Diff line number	Diff line
		@@ -3973,15 +3973,13 @@ static int easycap_usb_probe(struct usb_interface *intf,
		SAM("ends successfully for interface %i\n", bInterfaceNumber);
		return 0;
		}
		/*****************************************************************************/
		/---------------------------------------------------------------------------/

		/*
		* WHEN THIS FUNCTION IS CALLED THE EasyCAP HAS ALREADY BEEN PHYSICALLY
		* UNPLUGGED. HENCE peasycap->pusb_device IS NO LONGER VALID.
		*
		* THIS FUNCTION AFFECTS ALSA. BEWARE.
		* When this function is called the device has already been
		* physically unplugged.
		* Hence, peasycap->pusb_device is no longer valid.
		* This function affects alsa.
		*/
		/---------------------------------------------------------------------------/
		static void easycap_usb_disconnect(struct usb_interface *pusb_interface)
		{
		struct usb_host_interface *pusb_host_interface;
		@@ -4006,6 +4004,7 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface)
		minor = pusb_interface->minor;
		JOT(4, "intf[%i]: minor=%i\n", bInterfaceNumber, minor);

		/* There is nothing to do for Interface Number 1 */
		if (1 == bInterfaceNumber)
		return;

		@@ -4014,11 +4013,8 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface)
		SAY("ERROR: peasycap is NULL\n");
		return;
		}
		/---------------------------------------------------------------------------/
		/*
		* IF THE WAIT QUEUES ARE NOT CLEARED A DEADLOCK IS POSSIBLE. BEWARE.
		*/
		/---------------------------------------------------------------------------/

		/* If the waitqueues are not cleared a deadlock is possible */
		peasycap->video_eof = 1;
		peasycap->audio_eof = 1;
		wake_up_interruptible(&(peasycap->wq_video));
		@@ -4034,15 +4030,14 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface)
		default:
		break;
		}
		/--------------------------------------------------------------------------/

		/*
		* DEREGISTER
		*
		* THIS PROCEDURE WILL BLOCK UNTIL easycap_poll(), VIDEO IOCTL AND AUDIO
		* IOCTL ARE ALL UNLOCKED. IF THIS IS NOT DONE AN Oops CAN OCCUR WHEN
		* AN EasyCAP IS UNPLUGGED WHILE THE URBS ARE RUNNING. BEWARE.
		* Deregister
		* This procedure will block until easycap_poll(),
		* video and audio ioctl are all unlocked.
		* If this is not done an oops can occur when an easycap
		* is unplugged while the urbs are running.
		*/
		/--------------------------------------------------------------------------/
		kd = easycap_isdongle(peasycap);
		switch (bInterfaceNumber) {
		case 0: {
		@@ -4059,7 +4054,6 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface)
		} else {
		SAY("ERROR: %i=kd is bad: cannot lock dongle\n", kd);
		}
		/---------------------------------------------------------------------------/
		if (!peasycap->v4l2_device.name[0]) {
		SAM("ERROR: peasycap->v4l2_device.name is empty\n");
		if (0 <= kd && DONGLE_MANY > kd)
		@@ -4075,7 +4069,6 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface)
		JOM(4, "intf[%i]: video_unregister_device() minor=%i\n",
		bInterfaceNumber, minor);
		peasycap->registered_video--;
		/^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^/

		if (0 <= kd && DONGLE_MANY > kd) {
		mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
		@@ -4111,12 +4104,12 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface)
		default:
		break;
		}
		/---------------------------------------------------------------------------/

		/*
		* CALL easycap_delete() IF NO REMAINING REFERENCES TO peasycap
		* (ALSO WHEN ALSA HAS BEEN IN USE)
		* If no remaining references to peasycap,
		* call easycap_delete.
		* (Also when alsa has been in use)
		*/
		/---------------------------------------------------------------------------/
		if (!peasycap->kref.refcount.counter) {
		SAM("ERROR: peasycap->kref.refcount.counter is zero "
		"so cannot call kref_put()\n");
		@@ -4151,17 +4144,11 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface)
		mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
		JOT(4, "unlocked dongle[%i].mutex_video\n", kd);
		}
		/---------------------------------------------------------------------------/
		JOM(4, "ends\n");
		return;
		}
		/*****************************************************************************/

		/---------------------------------------------------------------------------/
		/*
		* PARAMETERS APPLICABLE TO ENTIRE DRIVER, I.E. BOTH VIDEO AND AUDIO
		*/
		/---------------------------------------------------------------------------/
		/* Devices supported by this driver */
		static struct usb_device_id easycap_usb_device_id_table[] = {
		{USB_DEVICE(USB_EASYCAP_VENDOR_ID, USB_EASYCAP_PRODUCT_ID)},
		{ }
		@@ -4196,14 +4183,11 @@ static int __init easycap_module_init(void)

		return rc;
		}
		/*****************************************************************************/

		static void __exit easycap_module_exit(void)
		{
		usb_deregister(&easycap_usb_driver);
		}
		/*****************************************************************************/

		module_init(easycap_module_init);
		module_exit(easycap_module_exit);

		/*****************************************************************************/