linux.git/drivers/staging/easycap, branch v2.6.39

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

2011-03-24T16:50:13+00:00

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
  [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
  [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
  [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
  [media] v4l: soc-camera: Store negotiated buffer settings
  [media] rc: interim support for 32-bit NEC-ish scancodes
  [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
  [media] lirc_zilog: error out if buffer read bytes != chunk size
  [media] lirc: silence some compile warnings
  [media] hdpvr: use same polling interval as other OS
  [media] ir-kbd-i2c: pass device code w/key in hauppauge case
  [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
  [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
  [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
  [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
  [media] rc-rc5-hauppauge-new: Add support for the old Black RC
  [media] rc-rc5-hauppauge-new: Add the old control to the table
  [media] rc-winfast: Fix the keycode tables
  [media] a800: Fix a few wrong IR key assignments
  [media] opera1: Use multimedia keys instead of an app-specific mapping
  [media] dw2102: Use multimedia keys instead of an app-specific mapping
  ...

Fix up trivial conflicts (remove/modify and some real conflicts) in:
	arch/arm/mach-omap2/devices.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/dabusb/dabusb.c
	drivers/staging/dabusb/dabusb.h
	drivers/staging/easycap/easycap_ioctl.c
	drivers/staging/usbvideo/usbvideo.c
	drivers/staging/usbvideo/vicam.c

[media] v4l: removal of old, obsolete ioctls

2011-03-21T23:32:12+00:00

Some ioctl's were defined wrong on 2.6.2 and 2.6.6, using the wrong
type of R/W arguments. They were fixed, but the old ioctl names are
still there, maintained to avoid breaking binary compatibility:

There's no sense on preserving those forever, as it is very doubtful
that someone would try to use a such old binary with a modern kernel.
Removing them will allow us to remove some magic done at the V4L ioctl
handler.

Note that any application compiled with a videodev2.h from 2.6.7 or later
will be using the correct ioctls.

Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2011-03-17T00:21:00+00:00

* 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  BKL: That's all, folks
  fs/locks.c: Remove stale FIXME left over from BKL conversion
  ipx: remove the BKL
  appletalk: remove the BKL
  x25: remove the BKL
  ufs: remove the BKL
  hpfs: remove the BKL
  drivers: remove extraneous includes of smp_lock.h
  tracing: don't trace the BKL
  adfs: remove the big kernel lock

staging/easycap: reduce code nesting in easycap_sound.c

2011-03-07T21:52:57+00:00

Reshuffle error handling to reduce indentation nesting
This reduce number of lines exceeding 80 characters
from 41 to 15

use:
if (error)
	(return, goto, continue)
CODE

instead of:

if (good)
	
else
	

Cc: Dan Carpenter 
Cc: Mike Thomas 
Signed-off-by: Tomas Winkler 
Signed-off-by: Greg Kroah-Hartman



staging/easycap: easycap_settings.c don't copy constant strings twice
2011-03-07T21:52:56+00:00

eliminate copying twice a constant string just capture it using
const char * pointer

piggyback some other style fixes

Cc: Mike Thomas 
Signed-off-by: Tomas Winkler 
Signed-off-by: Greg Kroah-Hartman 




staging/easycap: add first level indentation to easycap_settings.c
2011-03-07T21:52:56+00:00

Add first level indentation to easycap_sound_settings with astyle -t8
10 lines over 80 characters were left out for further fix

Cc: Mike Thomas 
Signed-off-by: Tomas Winkler 
Signed-off-by: Greg Kroah-Hartman 




staging/easycap: kill EASYCAP_IS_VIDEODEV_CLIENT compilation conditional
2011-03-07T21:52:56+00:00

remove EASYCAP_IS_VIDEODEV_CLIENT and irrelevant code as the define
is always set in the in-kernel driver

Cc: Mike Thomas 
Signed-off-by: Tomas Winkler 
Signed-off-by: Greg Kroah-Hartman 




staging/easycap: reduce code duplication for ssa stk settings
2011-03-07T21:52:55+00:00

reduce code duplication in register settings

instead of
	if (ntsc)
		
	else
		
use

	cfg = (ntsc) ? configNTSC : configPAL;
	

in addition change while loops to more readable for loops

Cc: Mike Thomas 
Signed-off-by: Tomas Winkler 
Signed-off-by: Greg Kroah-Hartman 




staging/easycap: wait_i2c should be static
2011-03-07T21:52:55+00:00

wait_i2c is only used from easycap_low.c
so remove it from the easycap.h and mark it static

Cc: Mike Thomas 
Signed-off-by: Tomas Winkler 
Signed-off-by: Greg Kroah-Hartman 




staging/easycap: convert comparison to NULL into boolean
2011-03-07T21:24:04+00:00

convert if (NULL != ptr) to if (ptr)
convert if (NULL == ptr) to if (!ptr)

Cc: Mike Thomas 
Signed-off-by: Tomas Winkler 
Signed-off-by: Greg Kroah-Hartman