linux-stable.git/drivers/video/matrox, branch linux-3.13.y

video: Remove unnecessary semicolons

2013-10-30T11:34:52+00:00

These aren't necessary after switch, for, and if blocks.

Signed-off-by: Joe Perches 
Signed-off-by: Tomi Valkeinen

framebuffer: Use fb_

2013-10-29T10:53:07+00:00

Neaten and shorten the code using the new fb_ macros.

Signed-off-by: Joe Perches 
Signed-off-by: Tomi Valkeinen

video/matrox/matroxfb_maven: Use module_i2c_driver to register driver

2013-09-19T10:30:10+00:00

Removing some boilerplate by using module_i2c_driver instead of calling
register and unregister in the otherwise empty init/exit functions.
Also removed a useless comment as suggested by Jean Delvare.

Signed-off-by: Peter Huewe 
Signed-off-by: Jean Delvare 
Cc: Jean-Christophe Plagniol-Villard 
Cc: Tomi Valkeinen 
Signed-off-by: Tomi Valkeinen

matroxfb: replace kmalloc and memset with kzalloc.

2013-07-26T08:35:17+00:00

Signed-off-by: Alexandru Juncu 
Signed-off-by: Tomi Valkeinen

matroxfb: convert struct i2c_msg initialization to C99 format

2013-04-29T22:54:26+00:00

Convert the struct i2c_msg initialization to C99 format.  This makes
maintaining and editing the code simpler.  Also helps once other fields
like transferred are added in future.

Thanks to Julia Lawall for automating the conversion.

Signed-off-by: Shubhrajyoti D 
Signed-off-by: Jean Delvare 
Cc: Julia Lawall 
Cc: Florian Tobias Schandinat 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING

2012-05-30T08:55:34+00:00

Since there are uses for I2C_M_NOSTART which are much more sensible and
standard than most of the protocol mangling functionality (the main one
being gather writes to devices where something like a register address
needs to be inserted before a block of data) create a new I2C_FUNC_NOSTART
for this feature and update all the users to use it.

Also strengthen the disrecommendation of the protocol mangling while we're
at it.

In the case of regmap-i2c we remove the requirement for mangling as
I2C_M_NOSTART is the only mangling feature which is being used.

Signed-off-by: Mark Brown 
Acked-by: Wolfram Sang 
Signed-off-by: Jean Delvare

fbdev: matroxfb: Fix compilation after fb_var_screeninfo change

2011-12-21T02:26:11+00:00

Commit fb21c2f42879 ("fbdev: Add FOURCC-based format configuration API")
modified the layout of the fb_var_screeninfo structure. Remove zero
fields from the static initializers in the matroxfb driver accordingly.

Signed-off-by: Laurent Pinchart 
Signed-off-by: Florian Tobias Schandinat

Fix common misspellings

2011-03-31T14:26:23+00:00

Fixes generated by 'codespell' and manually reviewed.

Signed-off-by: Lucas De Marchi

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

matrox: Remove legacy VIDIOC_*_OLD ioctls

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

Those ioctls were produced by the wrong arguments for _IO macros,
and were replaced by fixed versions on an early 2.6 kernel.

Signed-off-by: Mauro Carvalho Chehab