linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/1] media/video: vpif: fixing function name start to vpif_config_params
@ 2012-08-02  7:40 Dror Cohen
  2012-08-02  7:40 ` [PATCH 1/1] " Dror Cohen
  2012-08-02 10:51 ` [PATCH 0/1] " Sergei Shtylyov
  0 siblings, 2 replies; 4+ messages in thread
From: Dror Cohen @ 2012-08-02  7:40 UTC (permalink / raw)
  To: linux-media; +Cc: mchehab, nsekhar, davinci-linux-open-source, Dror Cohen

This patch address the issue that a function named config_vpif_params should
be vpif_config_params. This, however, conflicts with two structures defined
already. So I changed the structures to config_vpif_params_t (origin was
vpif_config_params)

Dror Cohen (1):
  fixing function name start to vpif_config_params

 drivers/media/video/davinci/vpif.c         |    6 +++---
 drivers/media/video/davinci/vpif_capture.c |    2 +-
 drivers/media/video/davinci/vpif_capture.h |    2 +-
 drivers/media/video/davinci/vpif_display.c |    2 +-
 drivers/media/video/davinci/vpif_display.h |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

-- 
1.7.5.4


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/1] media/video: vpif: fixing function name start to vpif_config_params
  2012-08-02  7:40 [PATCH 0/1] media/video: vpif: fixing function name start to vpif_config_params Dror Cohen
@ 2012-08-02  7:40 ` Dror Cohen
  2012-08-02 10:49   ` Sergei Shtylyov
  2012-08-02 10:51 ` [PATCH 0/1] " Sergei Shtylyov
  1 sibling, 1 reply; 4+ messages in thread
From: Dror Cohen @ 2012-08-02  7:40 UTC (permalink / raw)
  To: linux-media; +Cc: mchehab, nsekhar, davinci-linux-open-source, Dror Cohen

diff --git a/drivers/media/video/davinci/vpif.c b/drivers/media/video/davinci/vpif.c
index af96802..04dd8fa 100644
--- a/drivers/media/video/davinci/vpif.c
+++ b/drivers/media/video/davinci/vpif.c
@@ -301,12 +301,12 @@ static void vpif_set_mode_info(const struct vpif_channel_config_params *config,
 	regw(value, vpifregs[channel_id].v_cfg);
 }
 
-/* config_vpif_params
+/* vpif_config_params
  * Function to set the parameters of a channel
  * Mainly modifies the channel ciontrol register
  * It sets frame format, yc mux mode
  */
-static void config_vpif_params(struct vpif_params *vpifparams,
+static void vpif_config_params(struct vpif_params *vpifparams,
 				u8 channel_id, u8 found)
 {
 	const struct vpif_channel_config_params *config = &vpifparams->std_info;
@@ -374,7 +374,7 @@ int vpif_set_video_params(struct vpif_params *vpifparams, u8 channel_id)
 		found = 2;
 	}
 
-	config_vpif_params(vpifparams, channel_id, found);
+	vpif_config_params(vpifparams, channel_id, found);
 
 	regw(0x80, VPIF_REQ_SIZE);
 	regw(0x01, VPIF_EMULATION_CTRL);
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c
index 9604695..59104e6 100644
--- a/drivers/media/video/davinci/vpif_capture.c
+++ b/drivers/media/video/davinci/vpif_capture.c
@@ -67,7 +67,7 @@ MODULE_PARM_DESC(ch3_numbuffers, "Channel1 buffer count (default:3)");
 MODULE_PARM_DESC(ch2_bufsize, "Channel0 buffer size (default:1920 x 1080 x 2)");
 MODULE_PARM_DESC(ch3_bufsize, "Channel1 buffer size (default:720 x 576 x 2)");
 
-static struct vpif_config_params config_params = {
+static struct config_vpif_params_t config_params = {
 	.min_numbuffers = 3,
 	.numbuffers[0] = 3,
 	.numbuffers[1] = 3,
diff --git a/drivers/media/video/davinci/vpif_capture.h b/drivers/media/video/davinci/vpif_capture.h
index a693d4e..8863de1 100644
--- a/drivers/media/video/davinci/vpif_capture.h
+++ b/drivers/media/video/davinci/vpif_capture.h
@@ -144,7 +144,7 @@ struct vpif_device {
 	struct v4l2_subdev **sd;
 };
 
-struct vpif_config_params {
+struct config_vpif_params_t {
 	u8 min_numbuffers;
 	u8 numbuffers[VPIF_CAPTURE_NUM_CHANNELS];
 	s8 device_type;
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index e6488ee..652440d 100644
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -70,7 +70,7 @@ MODULE_PARM_DESC(ch3_numbuffers, "Channel3 buffer count (default:3)");
 MODULE_PARM_DESC(ch2_bufsize, "Channel2 buffer size (default:1920 x 1080 x 2)");
 MODULE_PARM_DESC(ch3_bufsize, "Channel3 buffer size (default:720 x 576 x 2)");
 
-static struct vpif_config_params config_params = {
+static struct config_vpif_params_t config_params = {
 	.min_numbuffers		= 3,
 	.numbuffers[0]		= 3,
 	.numbuffers[1]		= 3,
diff --git a/drivers/media/video/davinci/vpif_display.h b/drivers/media/video/davinci/vpif_display.h
index 56879d1..3e14807 100644
--- a/drivers/media/video/davinci/vpif_display.h
+++ b/drivers/media/video/davinci/vpif_display.h
@@ -154,7 +154,7 @@ struct vpif_device {
 
 };
 
-struct vpif_config_params {
+struct config_vpif_params_t {
 	u32 min_bufsize[VPIF_DISPLAY_NUM_CHANNELS];
 	u32 channel_bufsize[VPIF_DISPLAY_NUM_CHANNELS];
 	u8 numbuffers[VPIF_DISPLAY_NUM_CHANNELS];
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/1] media/video: vpif: fixing function name start to vpif_config_params
  2012-08-02  7:40 ` [PATCH 1/1] " Dror Cohen
@ 2012-08-02 10:49   ` Sergei Shtylyov
  0 siblings, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2012-08-02 10:49 UTC (permalink / raw)
  To: Dror Cohen; +Cc: linux-media, davinci-linux-open-source, mchehab

Hello.

On 02-08-2012 11:40, Dror Cohen wrote:

> diff --git a/drivers/media/video/davinci/vpif_capture.h b/drivers/media/video/davinci/vpif_capture.h
> index a693d4e..8863de1 100644
> --- a/drivers/media/video/davinci/vpif_capture.h
> +++ b/drivers/media/video/davinci/vpif_capture.h
> @@ -144,7 +144,7 @@ struct vpif_device {
>   	struct v4l2_subdev **sd;
>   };
>
> -struct vpif_config_params {
> +struct config_vpif_params_t {

    IMO, '_t' postfix is used only for *typedef* names.

> diff --git a/drivers/media/video/davinci/vpif_display.h b/drivers/media/video/davinci/vpif_display.h
> index 56879d1..3e14807 100644
> --- a/drivers/media/video/davinci/vpif_display.h
> +++ b/drivers/media/video/davinci/vpif_display.h
> @@ -154,7 +154,7 @@ struct vpif_device {
>
>   };
>
> -struct vpif_config_params {
> +struct config_vpif_params_t {

    Same comment.

WBR, Sergei


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 0/1] media/video: vpif: fixing function name start to vpif_config_params
  2012-08-02  7:40 [PATCH 0/1] media/video: vpif: fixing function name start to vpif_config_params Dror Cohen
  2012-08-02  7:40 ` [PATCH 1/1] " Dror Cohen
@ 2012-08-02 10:51 ` Sergei Shtylyov
  1 sibling, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2012-08-02 10:51 UTC (permalink / raw)
  To: Dror Cohen; +Cc: linux-media, davinci-linux-open-source, mchehab

Hello.

On 02-08-2012 11:40, Dror Cohen wrote:

> This patch address the issue that a function named config_vpif_params should
> be vpif_config_params. This, however, conflicts with two structures defined
> already.

    Function names shouldn't conflict with the structure tags. Structure tags 
always follow 'struct' keyword and are only valid in this context.

> So I changed the structures to config_vpif_params_t (origin was
> vpif_config_params)

WBR, Sergei


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-08-02 10:52 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-02  7:40 [PATCH 0/1] media/video: vpif: fixing function name start to vpif_config_params Dror Cohen
2012-08-02  7:40 ` [PATCH 1/1] " Dror Cohen
2012-08-02 10:49   ` Sergei Shtylyov
2012-08-02 10:51 ` [PATCH 0/1] " Sergei Shtylyov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).