aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-mpeg.c
diff options
context:
space:
mode:
authorlawrence rust <lawrence@softsystem.co.uk>2010-08-25 08:50:20 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:04:52 -0400
commit2e4e98e788d8fbe30892bee3375067a4937155da (patch)
tree66d0ae3a74fa77f3e1cffa752dc61bd4089ce609 /drivers/media/video/cx88/cx88-mpeg.c
parentf71d76812e6cd3af8e293eeb8eb465c208e771cc (diff)
V4L/DVB: drivers/media: Make static data tables and strings const
Making static data const avoids allocation of additional r/w memory and reduces initialisation time. It also provides some additional opportunities for compiler optimisations. Signed-off-by: Lawrence Rust <lvr@softsystem.co.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88/cx88-mpeg.c')
-rw-r--r--drivers/media/video/cx88/cx88-mpeg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 499f8d512ad6..f7d71acbb078 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -313,7 +313,7 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
313 313
314/* ----------------------------------------------------------- */ 314/* ----------------------------------------------------------- */
315 315
316static void do_cancel_buffers(struct cx8802_dev *dev, char *reason, int restart) 316static void do_cancel_buffers(struct cx8802_dev *dev, const char *reason, int restart)
317{ 317{
318 struct cx88_dmaqueue *q = &dev->mpegq; 318 struct cx88_dmaqueue *q = &dev->mpegq;
319 struct cx88_buffer *buf; 319 struct cx88_buffer *buf;
@@ -358,7 +358,7 @@ static void cx8802_timeout(unsigned long data)
358 do_cancel_buffers(dev,"timeout",1); 358 do_cancel_buffers(dev,"timeout",1);
359} 359}
360 360
361static char *cx88_mpeg_irqs[32] = { 361static const char * cx88_mpeg_irqs[32] = {
362 "ts_risci1", NULL, NULL, NULL, 362 "ts_risci1", NULL, NULL, NULL,
363 "ts_risci2", NULL, NULL, NULL, 363 "ts_risci2", NULL, NULL, NULL,
364 "ts_oflow", NULL, NULL, NULL, 364 "ts_oflow", NULL, NULL, NULL,
@@ -849,7 +849,7 @@ static void __devexit cx8802_remove(struct pci_dev *pci_dev)
849 kfree(dev); 849 kfree(dev);
850} 850}
851 851
852static struct pci_device_id cx8802_pci_tbl[] = { 852static const struct pci_device_id cx8802_pci_tbl[] = {
853 { 853 {
854 .vendor = 0x14f1, 854 .vendor = 0x14f1,
855 .device = 0x8802, 855 .device = 0x8802,