[PATCH] V4L: Storage class should be before const qualifier

[PATCH] V4L: Storage class should be before const qualifier

[Tobias Klauser]

The C99 specification states in section 6.11.5:

The placement of a storage-class specifier other than at the beginning
of the declaration specifiers in a declaration is an obsolescent
feature.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 drivers/media/video/gspca/t613.c |    2 +-
 drivers/media/video/tcm825x.c    |   22 +++++++++++-----------
 drivers/media/video/tcm825x.h    |    2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index 6ee111a..8b8c029 100644
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -271,7 +271,7 @@ struct additional_sensor_data {
 	const __u8 stream[4];
 };
 
-const static struct additional_sensor_data sensor_data[] = {
+static const struct additional_sensor_data sensor_data[] = {
     {				/* TAS5130A */
 	.data1 =
 		{0xd0, 0xbb, 0xd1, 0x28, 0xd2, 0x10, 0xd3, 0x10,
diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c
index 29991d1..b30c492 100644
--- a/drivers/media/video/tcm825x.c
+++ b/drivers/media/video/tcm825x.c
@@ -50,7 +50,7 @@ struct tcm825x_sensor {
 };
 
 /* list of image formats supported by TCM825X sensor */
-const static struct v4l2_fmtdesc tcm825x_formats[] = {
+static const struct v4l2_fmtdesc tcm825x_formats[] = {
 	{
 		.description = "YUYV (YUV 4:2:2), packed",
 		.pixelformat = V4L2_PIX_FMT_UYVY,
@@ -76,15 +76,15 @@ const static struct v4l2_fmtdesc tcm825x_formats[] = {
  * TCM825X register configuration for all combinations of pixel format and
  * image size
  */
-const static struct tcm825x_reg subqcif	=	{ 0x20, TCM825X_PICSIZ };
-const static struct tcm825x_reg qcif	=	{ 0x18, TCM825X_PICSIZ };
-const static struct tcm825x_reg cif	=	{ 0x14, TCM825X_PICSIZ };
-const static struct tcm825x_reg qqvga	=	{ 0x0c, TCM825X_PICSIZ };
-const static struct tcm825x_reg qvga	=	{ 0x04, TCM825X_PICSIZ };
-const static struct tcm825x_reg vga	=	{ 0x00, TCM825X_PICSIZ };
+static const struct tcm825x_reg subqcif	=	{ 0x20, TCM825X_PICSIZ };
+static const struct tcm825x_reg qcif	=	{ 0x18, TCM825X_PICSIZ };
+static const struct tcm825x_reg cif	=	{ 0x14, TCM825X_PICSIZ };
+static const struct tcm825x_reg qqvga	=	{ 0x0c, TCM825X_PICSIZ };
+static const struct tcm825x_reg qvga	=	{ 0x04, TCM825X_PICSIZ };
+static const struct tcm825x_reg vga	=	{ 0x00, TCM825X_PICSIZ };
 
-const static struct tcm825x_reg yuv422	=	{ 0x00, TCM825X_PICFMT };
-const static struct tcm825x_reg rgb565	=	{ 0x02, TCM825X_PICFMT };
+static const struct tcm825x_reg yuv422	=	{ 0x00, TCM825X_PICFMT };
+static const struct tcm825x_reg rgb565	=	{ 0x02, TCM825X_PICFMT };
 
 /* Our own specific controls */
 #define V4L2_CID_ALC				V4L2_CID_PRIVATE_BASE
@@ -248,10 +248,10 @@ static struct vcontrol {
 };
 
 
-const static struct tcm825x_reg *tcm825x_siz_reg[NUM_IMAGE_SIZES] =
+static const struct tcm825x_reg *tcm825x_siz_reg[NUM_IMAGE_SIZES] =
 { &subqcif, &qqvga, &qcif, &qvga, &cif, &vga };
 
-const static struct tcm825x_reg *tcm825x_fmt_reg[NUM_PIXEL_FORMATS] =
+static const struct tcm825x_reg *tcm825x_fmt_reg[NUM_PIXEL_FORMATS] =
 { &yuv422, &rgb565 };
 
 /*
diff --git a/drivers/media/video/tcm825x.h b/drivers/media/video/tcm825x.h
index 770ebac..5b7e696 100644
--- a/drivers/media/video/tcm825x.h
+++ b/drivers/media/video/tcm825x.h
@@ -188,7 +188,7 @@ struct tcm825x_platform_data {
 /* Array of image sizes supported by TCM825X.  These must be ordered from
  * smallest image size to largest.
  */
-const static struct capture_size tcm825x_sizes[] = {
+static const struct capture_size tcm825x_sizes[] = {
 	{ 128,  96 }, /* subQCIF */
 	{ 160, 120 }, /* QQVGA */
 	{ 176, 144 }, /* QCIF */
-- 
1.5.6.5

Re: [PATCH] V4L: Storage class should be before const qualifier

[Jiri Kosina]

On Mon, 9 Feb 2009, Tobias Klauser wrote:

> The C99 specification states in section 6.11.5:
> 
> The placement of a storage-class specifier other than at the beginning
> of the declaration specifiers in a declaration is an obsolescent
> feature.
> 
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
> ---
>  drivers/media/video/gspca/t613.c |    2 +-
>  drivers/media/video/tcm825x.c    |   22 +++++++++++-----------
>  drivers/media/video/tcm825x.h    |    2 +-
>  3 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
> index 6ee111a..8b8c029 100644
> --- a/drivers/media/video/gspca/t613.c
> +++ b/drivers/media/video/gspca/t613.c
> @@ -271,7 +271,7 @@ struct additional_sensor_data {
>  	const __u8 stream[4];
>  };
>  
> -const static struct additional_sensor_data sensor_data[] = {
> +static const struct additional_sensor_data sensor_data[] = {
>      {				/* TAS5130A */
>  	.data1 =
>  		{0xd0, 0xbb, 0xd1, 0x28, 0xd2, 0x10, 0xd3, 0x10,
> diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c
> index 29991d1..b30c492 100644
> --- a/drivers/media/video/tcm825x.c
> +++ b/drivers/media/video/tcm825x.c
> @@ -50,7 +50,7 @@ struct tcm825x_sensor {
>  };
>  
>  /* list of image formats supported by TCM825X sensor */
> -const static struct v4l2_fmtdesc tcm825x_formats[] = {
> +static const struct v4l2_fmtdesc tcm825x_formats[] = {
>  	{
>  		.description = "YUYV (YUV 4:2:2), packed",
>  		.pixelformat = V4L2_PIX_FMT_UYVY,
> @@ -76,15 +76,15 @@ const static struct v4l2_fmtdesc tcm825x_formats[] = {
>   * TCM825X register configuration for all combinations of pixel format and
>   * image size
>   */
> -const static struct tcm825x_reg subqcif	=	{ 0x20, TCM825X_PICSIZ };
> -const static struct tcm825x_reg qcif	=	{ 0x18, TCM825X_PICSIZ };
> -const static struct tcm825x_reg cif	=	{ 0x14, TCM825X_PICSIZ };
> -const static struct tcm825x_reg qqvga	=	{ 0x0c, TCM825X_PICSIZ };
> -const static struct tcm825x_reg qvga	=	{ 0x04, TCM825X_PICSIZ };
> -const static struct tcm825x_reg vga	=	{ 0x00, TCM825X_PICSIZ };
> +static const struct tcm825x_reg subqcif	=	{ 0x20, TCM825X_PICSIZ };
> +static const struct tcm825x_reg qcif	=	{ 0x18, TCM825X_PICSIZ };
> +static const struct tcm825x_reg cif	=	{ 0x14, TCM825X_PICSIZ };
> +static const struct tcm825x_reg qqvga	=	{ 0x0c, TCM825X_PICSIZ };
> +static const struct tcm825x_reg qvga	=	{ 0x04, TCM825X_PICSIZ };
> +static const struct tcm825x_reg vga	=	{ 0x00, TCM825X_PICSIZ };
>  
> -const static struct tcm825x_reg yuv422	=	{ 0x00, TCM825X_PICFMT };
> -const static struct tcm825x_reg rgb565	=	{ 0x02, TCM825X_PICFMT };
> +static const struct tcm825x_reg yuv422	=	{ 0x00, TCM825X_PICFMT };
> +static const struct tcm825x_reg rgb565	=	{ 0x02, TCM825X_PICFMT };
>  
>  /* Our own specific controls */
>  #define V4L2_CID_ALC				V4L2_CID_PRIVATE_BASE
> @@ -248,10 +248,10 @@ static struct vcontrol {
>  };
>  
>  
> -const static struct tcm825x_reg *tcm825x_siz_reg[NUM_IMAGE_SIZES] =
> +static const struct tcm825x_reg *tcm825x_siz_reg[NUM_IMAGE_SIZES] =
>  { &subqcif, &qqvga, &qcif, &qvga, &cif, &vga };
>  
> -const static struct tcm825x_reg *tcm825x_fmt_reg[NUM_PIXEL_FORMATS] =
> +static const struct tcm825x_reg *tcm825x_fmt_reg[NUM_PIXEL_FORMATS] =
>  { &yuv422, &rgb565 };
>  
>  /*
> diff --git a/drivers/media/video/tcm825x.h b/drivers/media/video/tcm825x.h
> index 770ebac..5b7e696 100644
> --- a/drivers/media/video/tcm825x.h
> +++ b/drivers/media/video/tcm825x.h
> @@ -188,7 +188,7 @@ struct tcm825x_platform_data {
>  /* Array of image sizes supported by TCM825X.  These must be ordered from
>   * smallest image size to largest.
>   */
> -const static struct capture_size tcm825x_sizes[] = {
> +static const struct capture_size tcm825x_sizes[] = {
>  	{ 128,  96 }, /* subQCIF */
>  	{ 160, 120 }, /* QQVGA */
>  	{ 176, 144 }, /* QCIF */

This doesn't seem to be picked by anyone for current -next/-mmotm, I have
applied it to trivial tree. Thanks,

-- 
Jiri Kosina
SUSE Labs

Re: [PATCH] V4L: Storage class should be before const qualifier

[CityK]

Jiri Kosina wrote:
> On Mon, 9 Feb 2009, Tobias Klauser wrote:
>   
>> .... [inline patch] ....
>>     
>
> This doesn't seem to be picked by anyone for current -next/-mmotm, I have
> applied it to trivial tree. Thanks,

Will this create any complication? As it is indeed queued in our
patchwork: http://patchwork.kernel.org/project/linux-media/list/

Re: [PATCH] V4L: Storage class should be before const qualifier

[Jiri Kosina]

On Mon, 16 Feb 2009, CityK wrote:

> >> .... [inline patch] ....
> > This doesn't seem to be picked by anyone for current -next/-mmotm, I have
> > applied it to trivial tree. Thanks,
> Will this create any complication? As it is indeed queued in our
> patchwork: http://patchwork.kernel.org/project/linux-media/list/

Hmm, patchwork ... did this land in any actual code tree? It has been 
submitted by Tobias on 9th Feb and I was not able to find it in any tree 
today, so I applied to to trivial tree (to which the patch has been 
originally CCed).

If you guys actually have queued in some tree, please let me know and I 
will drop it.

-- 
Jiri Kosina
SUSE Labs

Re: [PATCH] V4L: Storage class should be before const qualifier

[CityK]

Jiri Kosina wrote:
> On Mon, 16 Feb 2009, CityK wrote:
>
>   
>>>> .... [inline patch] ....
>>>>         
>>> This doesn't seem to be picked by anyone for current -next/-mmotm, I have
>>> applied it to trivial tree. Thanks,
>>>       
>> Will this create any complication? As it is indeed queued in our
>> patchwork: http://patchwork.kernel.org/project/linux-media/list/
>>     
>
> Hmm, patchwork ... did this land in any actual code tree? It has been 
> submitted by Tobias on 9th Feb and I was not able to find it in any tree 
> today, so I applied to to trivial tree (to which the patch has been 
> originally CCed).
>
> If you guys actually have queued in some tree, please let me know and I 
> will drop it.

I'll defer to Mauro for the absolutes, but it looks like it got applied
to V4L-DVB mainline Hg yesterday and is in Mauro's Linux-next git.