25 Mar, 2011
1 commit
-
* '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
22 Mar, 2011
1 commit
-
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
17 Mar, 2011
1 commit
-
* '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
08 Mar, 2011
10 commits
-
Reshuffle error handling to reduce indentation nesting
This reduce number of lines exceeding 80 characters
from 41 to 15use:
if (error)
(return, goto, continue)
CODEinstead of:
if (good)
else
Cc: Dan Carpenter
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
eliminate copying twice a constant string just capture it using
const char * pointerpiggyback some other style fixes
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
Add first level indentation to easycap_sound_settings with astyle -t8
10 lines over 80 characters were left out for further fixCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
remove EASYCAP_IS_VIDEODEV_CLIENT and irrelevant code as the define
is always set in the in-kernel driverCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
reduce code duplication in register settings
instead of
if (ntsc)
else
usecfg = (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 -
wait_i2c is only used from easycap_low.c
so remove it from the easycap.h and mark it staticCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
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 -
's/(false == \([^ ]\+\))/(!\1)/g'
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
's/(true == \([^ ]\+\))/(\1)/g'
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
mostly indentation fixes and some line over 80 characters fixes
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman
02 Mar, 2011
1 commit
-
These were missed the last time I cleaned this up
globally, because of code moving around or new code
getting merged.Signed-off-by: Arnd Bergmann
01 Mar, 2011
5 commits
-
Add the first level indentation to easycap_testcard.c with astyle -t8.
About 100 of 80 columns warnings were left out for further fixCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
Add the first level indentation to easycap_testcard.c with astyle -t8.
No chackpatch warnings were createdCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
Add first level indentation to easycap_sound_oss.c with astyle -t8
62 lines over 80 characters were left out for further fixCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
Add the first level indentation to easycap_sound.c with astyle -t8.
41 lines over 80 characters were left out for further fixCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
Add first level indentation to easayca_main.c
This created around 300 lines over 80 characters.
Around 100 of straight forward once were fixed in this patch.
The another 200 require more code movement and need to be fixed
laterCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman
24 Feb, 2011
4 commits
-
use USB_SUBCLASS_AUDIOSTREAMING constant from usb/audio.h
instead of 0x02Cc: Mike Thomas
Cc: Dan Carpenter
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Reviewed-by: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman -
make inputset population to be more compact and readable
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Reviewed-by: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman -
fix some code styles and drop too verbose printouts
and non relevant codeCc: Mike Thomas
Signed-off-by: Tomas Winkler
Reviewed-by: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman
19 Feb, 2011
6 commits
-
use %p instead of %X
drop casting of pointer to long long intCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
remove pointless compilation flag
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
EASYCAP_NEEDS_V4L2_DEVICE_H and EASYCAP_NEEDS_V4L2_FOPS are required in
in-tree driverCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
remove uneedet brackets in ifs and switches
drop pointless castings
other small fixesCc: Mike Thomas
Signed-off-by: Tomas Winkler
Reviewed-by: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman -
masking return value of usb_control_msg() will mask negative
error values into positive.Cc: Mike Thomas
Reported-by: Dan Carpenter
Signed-off-by: Tomas Winkler
Reviewed-by: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Tomas Winkler
Reviewed-by: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman
10 Feb, 2011
11 commits
-
NOREADBACK doesn't justify Kconfig option so we use module
paramter for it.Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
Use regget to reading back what was written to a register.
This required changning size argument to regget signatureOn the way remove usless variable casting
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
regget and regset functions are used only from within
easycap_low.c so they can be static
Move the functions to avoid forward declarations
Move GET and SET macro definitions into the c-fileCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
No longer needed feature for testing driver's handling of
the audio stream independently of the urb completion routineCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
This has simulated a fault condition of probing for audio capability
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
remove code guarded by AUDIOTIME define
This was experimental code in which I tried improve audio-video
synchronization but it didn't work wellCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
remove PREFER_NTSC ifdef as it cannot be possible put into Kconfig
Cc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman -
Use INFO level when registering driver and ERR for error.
Drop messages from oneliner exit functionCc: Mike Thomas
Signed-off-by: Tomas Winkler
Signed-off-by: Greg Kroah-Hartman