All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] staging: media: Fix block comment style
@ 2016-10-07 23:44 Elizabeth Ferdman
  0 siblings, 0 replies; only message in thread
From: Elizabeth Ferdman @ 2016-10-07 23:44 UTC (permalink / raw)
  To: outreachy-kernel
  Cc: amsfield22, daniel.baluta, sudipm.mukherjee, teddy.wang, gregkh

Fix checkpatch errors "Block comments use * on subsequent lines" and
"Block comments use a trailing */ on a separate line" to conform with
kernel coding style.

Signed-off-by: Elizabeth Ferdman <gnudevliz@gmail.com>
---
 drivers/staging/media/tw686x-kh/tw686x-kh-core.c  |  3 +-
 drivers/staging/media/tw686x-kh/tw686x-kh-video.c | 36 +++++++++++++----------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/media/tw686x-kh/tw686x-kh-core.c b/drivers/staging/media/tw686x-kh/tw686x-kh-core.c
index 03b3b62..1153ee0 100644
--- a/drivers/staging/media/tw686x-kh/tw686x-kh-core.c
+++ b/drivers/staging/media/tw686x-kh/tw686x-kh-core.c
@@ -120,7 +120,8 @@ static const struct pci_device_id tw686x_pci_tbl[] = {
 	/* not tested */
 	{PCI_DEVICE(0x1797, 0x6865), .driver_data = 4 | TYPE_SECOND_GEN},
 	/* TW6868 supports 8 A/V channels with an external TW2865 chip -
-	   not supported by the driver */
+	 * not supported by the driver
+	 */
 	{PCI_DEVICE(0x1797, 0x6868), .driver_data = 4}, /* not tested */
 	{PCI_DEVICE(0x1797, 0x6869), .driver_data = 8 | TYPE_SECOND_GEN},
 	{}
diff --git a/drivers/staging/media/tw686x-kh/tw686x-kh-video.c b/drivers/staging/media/tw686x-kh/tw686x-kh-video.c
index 9bf32ae..9def426 100644
--- a/drivers/staging/media/tw686x-kh/tw686x-kh-video.c
+++ b/drivers/staging/media/tw686x-kh/tw686x-kh-video.c
@@ -222,18 +222,19 @@ loop:
 }
 
 /* On TW6864 and TW6868, all channels share the pair of video DMA SG tables,
-   with 10-bit start_idx and end_idx determining start and end of frame buffer
-   for particular channel.
-   TW6868 with all its 8 channels would be problematic (only 127 SG entries per
-   channel) but we support only 4 channels on this chip anyway (the first
-   4 channels are driven with internal video decoder, the other 4 would require
-   an external TW286x part).
-
-   On TW6865 and TW6869, each channel has its own DMA SG table, with indexes
-   starting with 0. Both chips have complete sets of internal video decoders
-   (respectively 4 or 8-channel).
-
-   All chips have separate SG tables for two video frames. */
+ * with 10-bit start_idx and end_idx determining start and end of frame buffer
+ * for particular channel.
+ * TW6868 with all its 8 channels would be problematic (only 127 SG entries per
+ * channel) but we support only 4 channels on this chip anyway (the first
+ * 4 channels are driven with internal video decoder, the other 4 would require
+ * an external TW286x part).
+ *
+ * On TW6865 and TW6869, each channel has its own DMA SG table, with indexes
+ * starting with 0. Both chips have complete sets of internal video decoders
+ * (respectively 4 or 8-channel).
+ *
+ * All chips have separate SG tables for two video frames.
+ */
 
 static void setup_dma_cfg(struct tw686x_video_channel *vc)
 {
@@ -478,7 +479,8 @@ static int tw686x_enum_input(struct file *file, void *priv,
 			     struct v4l2_input *inp)
 {
 	/* the chip has internal multiplexer, support can be added
-	   if the actual hw uses it */
+	 * if the actual hw uses it
+	 */
 	if (inp->index)
 		return -EINVAL;
 
@@ -676,15 +678,17 @@ int tw686x_kh_video_init(struct tw686x_dev *dev)
 	for (n = 0; n < 2; n++)
 		if (is_second_gen(dev)) {
 			/* TW 6865, TW6869 - each channel needs a pair of
-			   descriptor tables */
+			 * descriptor tables
+			 */
 			for (ch = 0; ch < max_channels(dev); ch++)
 				dev->video_channels[ch].sg_tables[n].size =
 					SG_TABLE_SIZE;
 
 		} else
 			/* TW 6864, TW6868 - we need to allocate a pair of
-			   descriptor tables, common for all channels.
-			   Each table will be bigger than 4 KB. */
+			 * descriptor tables, common for all channels.
+			 * Each table will be bigger than 4 KB.
+			 */
 			dev->video_channels[0].sg_tables[n].size =
 				max_channels(dev) * SG_TABLE_SIZE;
 
-- 
2.1.4



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-10-07 23:44 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-07 23:44 [PATCH] staging: media: Fix block comment style Elizabeth Ferdman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.