diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2007-04-28 03:56:28 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-09 15:12:30 +0200 |
| commit | 5f12491c36acb94670d822a90c9295f6fd671c8a (patch) | |
| tree | 5ea5d0cd8fb4d705e491c5efb8098d2852fed9dd /drivers/media/video/v4l1-compat.c | |
| parent | V4L/DVB (5569): Fix: v4l1_compat should be called only if V4L1_COMPAT (diff) | |
| download | linux-5f12491c36acb94670d822a90c9295f6fd671c8a.tar.xz linux-5f12491c36acb94670d822a90c9295f6fd671c8a.zip | |
V4L/DVB (5570): V4l1-compat: misc fixes for pixelformat function
Mark the palette2pixelformat lookup table as const
pixelformat is unsigned, adjust the palette2pixelformat table and
pixelformat_to_palette()
palette_to_pixelformat() is a pure function
pixelformat_to_palette() is a const function
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/v4l1-compat.c')
| -rw-r--r-- | drivers/media/video/v4l1-compat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c index a861e150865e..efb67d29fc0b 100644 --- a/drivers/media/video/v4l1-compat.c +++ b/drivers/media/video/v4l1-compat.c @@ -127,7 +127,7 @@ set_v4l_control(struct inode *inode, /* ----------------------------------------------------------------- */ -static int palette2pixelformat[] = { +const static unsigned int palette2pixelformat[] = { [VIDEO_PALETTE_GREY] = V4L2_PIX_FMT_GREY, [VIDEO_PALETTE_RGB555] = V4L2_PIX_FMT_RGB555, [VIDEO_PALETTE_RGB565] = V4L2_PIX_FMT_RGB565, @@ -145,7 +145,7 @@ static int palette2pixelformat[] = { [VIDEO_PALETTE_YUV422P] = V4L2_PIX_FMT_YUV422P, }; -static unsigned int +static unsigned int __attribute_pure__ palette_to_pixelformat(unsigned int palette) { if (palette < ARRAY_SIZE(palette2pixelformat)) @@ -154,8 +154,8 @@ palette_to_pixelformat(unsigned int palette) return 0; } -static unsigned int -pixelformat_to_palette(int pixelformat) +static unsigned int __attribute_const__ +pixelformat_to_palette(unsigned int pixelformat) { int palette = 0; switch (pixelformat) |