1. 21 10月, 2010 8 次提交
    • S
      [media] v4l-dvb: using vmalloc needs vmalloc.h in cx231xx-417.c · 94399431
      Stephen Rothwell 提交于
      Fixes these build errors and warnings:
      
      drivers/media/video/cx231xx/cx231xx-417.c: In function 'cx231xx_load_firmware':
      drivers/media/video/cx231xx/cx231xx-417.c:943: error: implicit declaration of function 'vmalloc'
      drivers/media/video/cx231xx/cx231xx-417.c:943: warning: cast to pointer from integer of different size
      drivers/media/video/cx231xx/cx231xx-417.c:950: warning: cast to pointer from integer of different size
      drivers/media/video/cx231xx/cx231xx-417.c:1039: error: implicit declaration of function 'vfree'
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      94399431
    • M
      [media] cx231xx: remove some unused functions · 1001f908
      Mauro Carvalho Chehab 提交于
      This file came originally from cx23885 driver. Some functions aren't
      used. Now that they are declared as static, we have those errors:
      
      drivers/media/video/cx231xx/cx231xx-417.c:615: warning: ‘mc417_gpio_set’ defined but not used
      drivers/media/video/cx231xx/cx231xx-417.c:625: warning: ‘mc417_gpio_clear’ defined but not used
      drivers/media/video/cx231xx/cx231xx-417.c:635: warning: ‘mc417_gpio_enable’ defined but not used
      
      As they're not used, just remove them. If needed, they can be restored from
      the git logs or from the cx23885 driver.
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      1001f908
    • M
      [media] cx231xx: declare static functions as such · 82c3ccaa
      Mauro Carvalho Chehab 提交于
      drivers/media/video/cx23885/built-in.o: In function `mc417_memory_write':
      /home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:482: multiple definition of `mc417_memory_write'
      drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:477: first defined here
      drivers/media/video/cx23885/built-in.o: In function `mc417_gpio_set':
      /home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:636: multiple definition of `mc417_gpio_set'
      drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:615: first defined here
      drivers/media/video/cx23885/built-in.o: In function `mc417_gpio_enable':
      /home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:656: multiple definition of `mc417_gpio_enable'
      drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:635: first defined here
      drivers/media/video/cx23885/built-in.o: In function `mc417_memory_read':
      /home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:546: multiple definition of `mc417_memory_read'
      drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:541: first defined here
      drivers/media/video/cx23885/built-in.o: In function `mc417_gpio_clear':
      /home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:646: multiple definition of `mc417_gpio_clear'
      drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:625: first defined here
      drivers/media/video/cx23885/built-in.o: In function `mc417_register_read':
      /home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:388: multiple definition of `mc417_register_read'
      drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:401: first defined here
      drivers/media/video/cx23885/built-in.o: In function `mc417_register_write':
      /home/v4l/v4l/patchwork/drivers/media/video/cx23885/cx23885-417.c:324: multiple definition of `mc417_register_write'
      drivers/media/video/cx231xx/built-in.o:/home/v4l/v4l/patchwork/drivers/media/video/cx231xx/cx231xx-417.c:343: first defined here
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      82c3ccaa
    • M
      [media] cx231xx-417: Fix a gcc warning · bae94dc3
      Mauro Carvalho Chehab 提交于
      gcc didn't like to have i++ inside a complex operation:
      
      drivers/media/video/cx231xx/cx231xx-417.c: In function ‘cx231xx_load_firmware’:
      drivers/media/video/cx231xx/cx231xx-417.c:1059: warning: operation on ‘i’ may be undefined
      drivers/media/video/cx231xx/cx231xx-417.c:1061: warning: operation on ‘i’ may be undefined
      drivers/media/video/cx231xx/cx231xx-417.c:1063: warning: operation on ‘i’ may be undefined
      
      Btw, I agree with gcc, as we're using i and i++ at the same operation and,
      depending on how optimization may occur, it may produce a wrong code.
      
      While here, fix CodingStyle issues on the changed code.
      Acked-by: NSri Deevi <Srinivasa.Deevi@conexant.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      bae94dc3
    • M
      [media] CodingStyle cleanup at s5h1432 and cx231xx · 955e6ed8
      Mauro Carvalho Chehab 提交于
      The patches received from the vendor contained a lot of CodingStyle
      issues. Cleans the style issues reported by checkpatch.pl on
      those drivers.
      
      It is better to do such style fixes when merging a big set of
      changes than latter. Of course, the better is to receive patches
      already cleaned ;)
      Acked-by: NSri Deevi <Srinivasa.Deevi@conexant.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      955e6ed8
    • M
      [media] cx231xx: remove a printk warning at -avcore and at -417 · 62c78c96
      Mauro Carvalho Chehab 提交于
      drivers/media/video/cx231xx/cx231xx-avcore.c:1608: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘long unsigned int’
      drivers/media/video/cx231xx/cx231xx-417.c:1047: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘size_t’
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      62c78c96
    • D
      [media] cx231xx: fix format string warning · dd067a8d
      Devin Heitmueller 提交于
      Change a %x to a %p since the variable is a pointer
      Signed-off-by: NDevin Heitmueller <dheitmueller@hauppauge.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      dd067a8d
    • P
      [media] cx231xx: Added support for Carraera, Shelby, RDx_253S and VIDEO_GRABBER · 64fbf444
      Palash Bandyopadhyay 提交于
      Added support for new cx231xx boards - Carraera, Shelby, RDx_253S and
      VIDEO_GRABBER.
      
      [mchehab@redhat.com: Fix a merge conflict with BKL removal patches]
      Signed-off-by: NPalash Bandyopadhyay <palash.bandyopadhyay@conexant.com>
      Signed-off-by: NDevin Heitmueller <dheitmueller@hauppauge.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      64fbf444