Skip to content

Commit

Permalink
V4L/DVB (10628): V4L: Storage class should be before const qualifier
Browse files Browse the repository at this point in the history 
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.

Cc: Jean-Francois Moine <moinejf@free.fr>
Cc: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Tobias Klauser authored and Mauro Carvalho Chehab committed Mar 30, 2009
1 parent 92e8c91 commit e23b290
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion drivers/media/video/gspca/t613.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,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[] = {
{ /* OM6802 */
.data1 =
{0xc2, 0x28, 0x0f, 0x22, 0xcd, 0x27, 0x2c, 0x06,
Expand Down
22 changes: 11 additions & 11 deletions drivers/media/video/tcm825x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down Expand Up @@ -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 };

/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/tcm825x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit e23b290

Please sign in to comment.