linux-toradex.git/drivers/media/common/saa7146_video.c, branch v3.4.59

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-07T03:44:47+00:00

* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include 
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include 
  net: sch_generic remove redundant use of 
  net: inet_timewait_sock doesnt need 
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h

drivers/media: Add module.h to all files using it implicitly

2011-10-31T23:31:51+00:00

A pending cleanup will mean that module.h won't be implicitly
everywhere anymore.  Make sure the modular drivers in clocksource
are actually calling out for  explicitly in advance.

Signed-off-by: Paul Gortmaker

[media] saa7146: fix compiler warning

2011-09-06T17:40:09+00:00

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

[media] saa7146: Use current logging styles

2011-09-03T23:54:14+00:00

Standardize the mechanisms to emit logging messages.

A few other modules used an #include from saa7146,
convert those at the same time.

Add pr_fmt.
Convert printks to pr_
Convert printks without KERN_ to appropriate pr_.
Convert logging macros requiring multiple parentheses to normal style.
Removed embedded prefixes when pr_fmt was added.
Whitespace cleanups when around other conversions.
Use printf extension %pM to print mac address.
Coalesce format strings.

Signed-off-by: Joe Perches 
Acked-by: Michael Hunold 
Signed-off-by: Mauro Carvalho Chehab

[media] saa7146: Convert from .ioctl to .unlocked_ioctl

2011-01-19T13:28:10+00:00

Convert saa7146 to use core-assisted locking.

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

[media] V4L: remove V4L1 compatibility mode

2010-12-29T10:17:07+00:00

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

[media] Don't export format_by_forcc on two different drivers

2010-12-02T03:59:10+00:00

Drivers should append their name on exported symbols, to avoid
conflicts with allyesconfig:

drivers/staging/built-in.o: In function `format_by_fourcc':
/home/v4l/work_trees/linus/drivers/staging/cx25821/cx25821-video.c:96: multiple definition of `format_by_fourcc'
drivers/media/built-in.o:/home/v4l/work_trees/linus/drivers/media/common/saa7146_video.c:88: first defined here

Let's rename both occurences with a small shellscript:

for i in drivers/staging/cx25821/*.[ch]; do sed s,format_by_fourcc,cx25821_format_by_fourcc,g <$i >a && mv a $i; done
for i in drivers/media/common/saa7146*.[ch]; do sed s,format_by_fourcc,saa7146_format_by_fourcc,g <$i >a && mv a $i; done
for i in include/media/saa7146*.[ch]; do sed s,format_by_fourcc,saa7146_format_by_fourcc,g <$i >a && mv a $i; done

Signed-off-by: Mauro Carvalho Chehab

V4L/DVB: videobuf: add ext_lock argument to the queue init functions

2010-10-21T03:06:14+00:00

Add an ext_lock argument to the videobuf init functions. This allows
drivers to pass the vdev->lock pointer (or any other externally held lock)
to videobuf. For now all drivers just pass NULL.

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

V4L/DVB: drivers/media: Remove unnecessary casts of private_data

2010-08-02T19:42:53+00:00

Signed-off-by: Joe Perches 
Acked-by: Jarod Wilson 
Acked-by: Laurent Pinchart 
Signed-off-by: Mauro Carvalho Chehab

V4L/DVB: saa7146: fix up bytesperline if it is an impossible value

2010-05-06T22:19:04+00:00

xawtv using DGA on a Radeon graphics card provides bogus
values to S_FBUF, which will then screw up overlay video:

https://bugs.launchpad.net/ubuntu/+source/xawtv/+bug/499734

This fixes the bytesperline value if it is off completely.

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