提交 df8c4b72 编写于 作者: E Ezequiel García 提交者: Mauro Carvalho Chehab

[media] staging: easycap: Clean comment style in easycap_delete()

Signed-off-by: NEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 cf32b65d
...@@ -700,17 +700,13 @@ static int videodev_release(struct video_device *pvideo_device) ...@@ -700,17 +700,13 @@ static int videodev_release(struct video_device *pvideo_device)
JOM(4, "ending successfully\n"); JOM(4, "ending successfully\n");
return 0; return 0;
} }
/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
/*****************************************************************************/
/*--------------------------------------------------------------------------*/
/* /*
* THIS FUNCTION IS CALLED FROM WITHIN easycap_usb_disconnect() AND IS * This function is called from within easycap_usb_disconnect() and is
* PROTECTED BY SEMAPHORES SET AND CLEARED BY easycap_usb_disconnect(). * protected by semaphores set and cleared by easycap_usb_disconnect().
* * By this stage the device has already been physically unplugged,
* BY THIS STAGE THE DEVICE HAS ALREADY BEEN PHYSICALLY UNPLUGGED, SO * so peasycap->pusb_device is no longer valid.
* peasycap->pusb_device IS NO LONGER VALID.
*/ */
/*---------------------------------------------------------------------------*/
static void easycap_delete(struct kref *pkref) static void easycap_delete(struct kref *pkref)
{ {
struct easycap *peasycap; struct easycap *peasycap;
...@@ -731,11 +727,8 @@ static void easycap_delete(struct kref *pkref) ...@@ -731,11 +727,8 @@ static void easycap_delete(struct kref *pkref)
return; return;
} }
kd = easycap_isdongle(peasycap); kd = easycap_isdongle(peasycap);
/*---------------------------------------------------------------------------*/
/* /* Free video urbs */
* FREE VIDEO.
*/
/*---------------------------------------------------------------------------*/
if (peasycap->purb_video_head) { if (peasycap->purb_video_head) {
m = 0; m = 0;
list_for_each(plist_head, peasycap->purb_video_head) { list_for_each(plist_head, peasycap->purb_video_head) {
...@@ -750,7 +743,6 @@ static void easycap_delete(struct kref *pkref) ...@@ -750,7 +743,6 @@ static void easycap_delete(struct kref *pkref)
} }
JOM(4, "%i video urbs freed\n", m); JOM(4, "%i video urbs freed\n", m);
/*---------------------------------------------------------------------------*/
JOM(4, "freeing video data_urb structures.\n"); JOM(4, "freeing video data_urb structures.\n");
m = 0; m = 0;
list_for_each_safe(plist_head, plist_next, list_for_each_safe(plist_head, plist_next,
...@@ -768,7 +760,8 @@ static void easycap_delete(struct kref *pkref) ...@@ -768,7 +760,8 @@ static void easycap_delete(struct kref *pkref)
JOM(4, "setting peasycap->purb_video_head=NULL\n"); JOM(4, "setting peasycap->purb_video_head=NULL\n");
peasycap->purb_video_head = NULL; peasycap->purb_video_head = NULL;
} }
/*---------------------------------------------------------------------------*/
/* Free video isoc buffers */
JOM(4, "freeing video isoc buffers.\n"); JOM(4, "freeing video isoc buffers.\n");
m = 0; m = 0;
for (k = 0; k < VIDEO_ISOC_BUFFER_MANY; k++) { for (k = 0; k < VIDEO_ISOC_BUFFER_MANY; k++) {
...@@ -784,7 +777,7 @@ static void easycap_delete(struct kref *pkref) ...@@ -784,7 +777,7 @@ static void easycap_delete(struct kref *pkref)
} }
JOM(4, "isoc video buffers freed: %i pages\n", JOM(4, "isoc video buffers freed: %i pages\n",
m * (0x01 << VIDEO_ISOC_ORDER)); m * (0x01 << VIDEO_ISOC_ORDER));
/*---------------------------------------------------------------------------*/ /* Free video field buffers */
JOM(4, "freeing video field buffers.\n"); JOM(4, "freeing video field buffers.\n");
gone = 0; gone = 0;
for (k = 0; k < FIELD_BUFFER_MANY; k++) { for (k = 0; k < FIELD_BUFFER_MANY; k++) {
...@@ -799,7 +792,8 @@ static void easycap_delete(struct kref *pkref) ...@@ -799,7 +792,8 @@ static void easycap_delete(struct kref *pkref)
} }
} }
JOM(4, "video field buffers freed: %i pages\n", gone); JOM(4, "video field buffers freed: %i pages\n", gone);
/*---------------------------------------------------------------------------*/
/* Free video frame buffers */
JOM(4, "freeing video frame buffers.\n"); JOM(4, "freeing video frame buffers.\n");
gone = 0; gone = 0;
for (k = 0; k < FRAME_BUFFER_MANY; k++) { for (k = 0; k < FRAME_BUFFER_MANY; k++) {
...@@ -814,11 +808,8 @@ static void easycap_delete(struct kref *pkref) ...@@ -814,11 +808,8 @@ static void easycap_delete(struct kref *pkref)
} }
} }
JOM(4, "video frame buffers freed: %i pages\n", gone); JOM(4, "video frame buffers freed: %i pages\n", gone);
/*---------------------------------------------------------------------------*/
/* /* Free audio urbs */
* FREE AUDIO.
*/
/*---------------------------------------------------------------------------*/
if (peasycap->purb_audio_head) { if (peasycap->purb_audio_head) {
JOM(4, "freeing audio urbs\n"); JOM(4, "freeing audio urbs\n");
m = 0; m = 0;
...@@ -833,7 +824,6 @@ static void easycap_delete(struct kref *pkref) ...@@ -833,7 +824,6 @@ static void easycap_delete(struct kref *pkref)
} }
} }
JOM(4, "%i audio urbs freed\n", m); JOM(4, "%i audio urbs freed\n", m);
/*---------------------------------------------------------------------------*/
JOM(4, "freeing audio data_urb structures.\n"); JOM(4, "freeing audio data_urb structures.\n");
m = 0; m = 0;
list_for_each_safe(plist_head, plist_next, list_for_each_safe(plist_head, plist_next,
...@@ -851,7 +841,8 @@ static void easycap_delete(struct kref *pkref) ...@@ -851,7 +841,8 @@ static void easycap_delete(struct kref *pkref)
JOM(4, "setting peasycap->purb_audio_head=NULL\n"); JOM(4, "setting peasycap->purb_audio_head=NULL\n");
peasycap->purb_audio_head = NULL; peasycap->purb_audio_head = NULL;
} }
/*---------------------------------------------------------------------------*/
/* Free audio isoc buffers */
JOM(4, "freeing audio isoc buffers.\n"); JOM(4, "freeing audio isoc buffers.\n");
m = 0; m = 0;
for (k = 0; k < AUDIO_ISOC_BUFFER_MANY; k++) { for (k = 0; k < AUDIO_ISOC_BUFFER_MANY; k++) {
...@@ -867,7 +858,6 @@ static void easycap_delete(struct kref *pkref) ...@@ -867,7 +858,6 @@ static void easycap_delete(struct kref *pkref)
} }
JOM(4, "easyoss_delete(): isoc audio buffers freed: %i pages\n", JOM(4, "easyoss_delete(): isoc audio buffers freed: %i pages\n",
m * (0x01 << AUDIO_ISOC_ORDER)); m * (0x01 << AUDIO_ISOC_ORDER));
/*---------------------------------------------------------------------------*/
JOM(4, "freeing easycap structure.\n"); JOM(4, "freeing easycap structure.\n");
allocation_video_urb = peasycap->allocation_video_urb; allocation_video_urb = peasycap->allocation_video_urb;
allocation_video_page = peasycap->allocation_video_page; allocation_video_page = peasycap->allocation_video_page;
...@@ -895,7 +885,6 @@ static void easycap_delete(struct kref *pkref) ...@@ -895,7 +885,6 @@ static void easycap_delete(struct kref *pkref)
kfree(peasycap); kfree(peasycap);
/*---------------------------------------------------------------------------*/
SAY("%8i=video urbs after all deletions\n", allocation_video_urb); SAY("%8i=video urbs after all deletions\n", allocation_video_urb);
SAY("%8i=video pages after all deletions\n", allocation_video_page); SAY("%8i=video pages after all deletions\n", allocation_video_page);
SAY("%8i=video structs after all deletions\n", allocation_video_struct); SAY("%8i=video structs after all deletions\n", allocation_video_struct);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册