linux-stable.git/drivers/staging/tm6000, branch linux-3.1.y

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

2011-07-30T07:08:53+00:00

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
  [media] ir-mce_kbd-decoder: include module.h for its facilities
  [media] ov5642: include module.h for its facilities
  [media] em28xx: Fix DVB-C maxsize for em2884
  [media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
  [media] v4l: mt9v032: Fix Bayer pattern
  [media] V4L: mt9m111: rewrite set_pixfmt
  [media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
  [media] V4L: initial driver for ov5642 CMOS sensor
  [media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
  [media] V4L: soc-camera: remove soc-camera bus and devices on it
  [media] V4L: soc-camera: un-export the soc-camera bus
  [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
  [media] V4L: add media bus configuration subdev operations
  [media] V4L: soc-camera: group struct field initialisations together
  [media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
  [media] V4L: pxa-camera: switch to using standard PM hooks
  [media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
  [media] Don't OOPS if videobuf_dvb_get_frontend return NULL
  [media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
  [media] omap3isp: Support configurable HS/VS polarities
  ...

Fix up conflicts:
 - arch/arm/mach-omap2/board-rx51-peripherals.c:
     cleanup regulator supply definitions in mach-omap2
   vs
     OMAP3: RX-51: define vdds_csib regulator supply
 - drivers/staging/tm6000/tm6000-alsa.c (trivial)

[media] TM6000: alsa: Clean up kernel coding style errors

2011-07-27T20:55:55+00:00

There were several coding style errors as reported by checkpatch.pl. This
patch should fix those errors with the single exception of the open square
bracket issue on line 45.

[mchehab@redhat.com: Fix a merge conflict]
Signed-off-by: Adam M. Dutko 
Signed-off-by: Mauro Carvalho Chehab

[media] tm6000: remove a check for NO_PCM_LOCK

2011-07-27T20:55:55+00:00

This was likely used by some test. There's no sense on keeping it
upstream.

Signed-off-by: Mauro Carvalho Chehab

Staging: tm6000: remove unneeded check in get_next_buf()

2011-07-08T21:06:38+00:00

We dereference "buf" on the line before so if it were NULL here we
would have OOPsed earlier.  Also list_entry() never returns NULL.
And finally, we handled the situation where the list is empty
earlier in the function.

So this test isn't needed and I've removed it.

Signed-off-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman

Remove unneeded version.h includes (and add where needed) for drivers/tm6000/

2011-07-05T17:39:38+00:00

It was pointed out by 'make versioncheck' that linux/version.h was not
always being included where needed and sometimes included needlessly
in drivers/staging/tm6000/.
This patch fixes up the includes.

Signed-off-by: Jesper Juhl 
Signed-off-by: Greg Kroah-Hartman

tm6000: Cleaned up code style in tm6000-alsa.c

2011-06-28T21:27:24+00:00

Fixed all errors but one (possibly a mistake by the checker) reported by
the checker.

Signed-off-by: Curtis McEnroe 
Signed-off-by: Greg Kroah-Hartman

tm6000: Clean up code style in tm6000-input.c

2011-06-28T21:27:24+00:00

Removed unnecessary braces.

Signed-off-by: Curtis McEnroe 
Signed-off-by: Greg Kroah-Hartman

tm6000: Cleaned up code style in tm6000-i2c.c

2011-06-28T21:27:23+00:00

Replaced __FUNCTION__ with __func__

Signed-off-by: Curtis McEnroe 
Signed-off-by: Greg Kroah-Hartman

tm6000: Cleaned up code style in tm6000-dbv.c

2011-06-28T21:27:23+00:00

Replaced usage of __FUNCTION__ with __func__

Signed-off-by: Curtis McEnroe 
Signed-off-by: Greg Kroah-Hartman

staging: tm6000: cleaned up code in tm6000-video.c according to coding style

2011-06-28T21:04:53+00:00

Fixed all errors reported by the checker in tm6000-video.c mostly relating
to whitespace.

Signed-off-by: Curtis McEnroe 
Signed-off-by: Greg Kroah-Hartman