summaryrefslogtreecommitdiff
path: root/drivers/staging/easycap
AgeCommit message (Collapse)Author
2011-03-24Merge branch 'v4l_for_linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * '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
2011-03-21[media] v4l: removal of old, obsolete ioctlsHans Verkuil
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 <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-03-17Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds
* '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
2011-03-07staging/easycap: reduce code nesting in easycap_sound.cTomas Winkler
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) <CODE> else <EXCEPTION HANDLING> Cc: Dan Carpenter <error27@gmail.com> Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07staging/easycap: easycap_settings.c don't copy constant strings twiceTomas Winkler
eliminate copying twice a constant string just capture it using const char * pointer piggyback some other style fixes Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07staging/easycap: add first level indentation to easycap_settings.cTomas Winkler
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 <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07staging/easycap: kill EASYCAP_IS_VIDEODEV_CLIENT compilation conditionalTomas Winkler
remove EASYCAP_IS_VIDEODEV_CLIENT and irrelevant code as the define is always set in the in-kernel driver Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07staging/easycap: reduce code duplication for ssa stk settingsTomas Winkler
reduce code duplication in register settings instead of if (ntsc) <CODE BLOCK> else <CODE BLOCK> use cfg = (ntsc) ? <chip>configNTSC : <chip>configPAL; <CODE BLOCK> in addition change while loops to more readable for loops Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07staging/easycap: wait_i2c should be staticTomas Winkler
wait_i2c is only used from easycap_low.c so remove it from the easycap.h and mark it static Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07staging/easycap: convert comparison to NULL into booleanTomas Winkler
convert if (NULL != ptr) to if (ptr) convert if (NULL == ptr) to if (!ptr) Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07staging/easycap: replace if(false == var) with if (!var)Tomas Winkler
's/(false == \([^ ]\+\))/(!\1)/g' Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07staging/easycap: replace if(true == var) with if (var)Tomas Winkler
's/(true == \([^ ]\+\))/(\1)/g' Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07staging/easycap: more style fixing in easycap_main.cTomas Winkler
mostly indentation fixes and some line over 80 characters fixes Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-01drivers: remove extraneous includes of smp_lock.hArnd Bergmann
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 <arnd@arndb.de>
2011-02-28staging/easycap: add first level indentation to easycap_ioctl.cTomas Winkler
Add the first level indentation to easycap_testcard.c with astyle -t8. About 100 of 80 columns warnings were left out for further fix Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-28staging/easycap: add first level indentation to easycap_testcard.cTomas Winkler
Add the first level indentation to easycap_testcard.c with astyle -t8. No chackpatch warnings were created Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-28staging/easycap: add first level indentation to easycap_sound_oss.cTomas Winkler
Add first level indentation to easycap_sound_oss.c with astyle -t8 62 lines over 80 characters were left out for further fix Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-28staging/easycap: add first level indentation to easycap_sound.cTomas Winkler
Add the first level indentation to easycap_sound.c with astyle -t8. 41 lines over 80 characters were left out for further fix Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-28staging/easycap: add first level indentation to easycap_mainTomas Winkler
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 later Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-23staging/easycap: use USB_SUBCLASS_AUDIOSTREAMING instead of 0x02Tomas Winkler
use USB_SUBCLASS_AUDIOSTREAMING constant from usb/audio.h instead of 0x02 Cc: Mike Thomas <rmthomas@sciolus.org> Cc: Dan Carpenter <error27@gmail.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-23staging/easycap: easycap_usb_probe: more indentation cleanupsTomas Winkler
Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-23staging/easycap: revamp inputset population codeTomas Winkler
make inputset population to be more compact and readable Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-23staging/easycap: fix style issues in easycap_usb_probe functionTomas Winkler
fix some code styles and drop too verbose printouts and non relevant code Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18staging/easycap: use %p for printing pointersTomas Winkler
use %p instead of %X drop casting of pointer to long long int Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18staging/easycap: drop EASYCAP_NEEDS_USBVIDEO_HTomas Winkler
remove pointless compilation flag Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18staging/easycap: kill EASYCAP_NEEDS_V4L2_DEVICE_H and EASYCAP_NEEDS_V4L2_FOPSTomas Winkler
EASYCAP_NEEDS_V4L2_DEVICE_H and EASYCAP_NEEDS_V4L2_FOPS are required in in-tree driver Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18staging/easycap: style changes in easycap_low.cTomas Winkler
remove uneedet brackets in ifs and switches drop pointless castings other small fixes Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18staging/easycap: don't mask return value of usb_control_msg() by 0xFFTomas Winkler
masking return value of usb_control_msg() will mask negative error values into positive. Cc: Mike Thomas <rmthomas@sciolus.org> Reported-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18staging/easycap: add first level indetnation for easycap_low.cTomas Winkler
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging/easycap: replace NOREADBACK with moduel parameterTomas Winkler
NOREADBACK doesn't justify Kconfig option so we use module paramter for it. Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging/easycap: use regget for register back readingTomas Winkler
Use regget to reading back what was written to a register. This required changning size argument to regget signature On the way remove usless variable casting Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09stagine/easycap: make functions regset and regget staticTomas Winkler
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-file Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging/easycap: add first level indentation to regget/set functionsTomas Winkler
Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging/easycap: remove TESTONE and EASYCAP_TESTTONETomas Winkler
No longer needed feature for testing driver's handling of the audio stream independently of the urb completion routine Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging/easycap: remove EASYCAP_SILENT optionTomas Winkler
This has simulated a fault condition of probing for audio capability Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging/easycap: remove AUDIOTIME featureTomas Winkler
remove code guarded by AUDIOTIME define This was experimental code in which I tried improve audio-video synchronization but it didn't work well Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging/easycap: remove obsolete VIDIOC_S_CTRL_OLD ioctlTomas Winkler
Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging/easycap: replace one more EASYCAP_NEEDS_ALSA with CONFIG_EASYCAP_OSSTomas Winkler
Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09stagine/easycap: use module paramter for default encoding instead of ifdefTomas Winkler
remove PREFER_NTSC ifdef as it cannot be possible put into Kconfig Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging/easycap: prefer printk over SAY in module entry functionsTomas Winkler
Use INFO level when registering driver and ERR for error. Drop messages from oneliner exit function Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging/easycap: remove paranoid argument checks in usb probe/disconnectTomas Winkler
remove checks for NULL for usb_interface. USB bus won't call these functions with NULL Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging/easycap: fix build when SND is not enabledTomas Winkler
Fix easycap build when CONFIG_SOUND is enabled but CONFIG_SND is not enabled. use choice construct to select between ALSA and OSS API binding drivers/built-in.o: In function `easycap_usb_disconnect': easycap_main.c:(.text+0x2aba20): undefined reference to `snd_card_free' drivers/built-in.o: In function `easycap_alsa_probe': (.text+0x2b784b): undefined reference to `snd_card_create' drivers/built-in.o: In function `easycap_alsa_probe': (.text+0x2b78fb): undefined reference to `snd_pcm_new' drivers/built-in.o: In function `easycap_alsa_probe': (.text+0x2b7916): undefined reference to `snd_pcm_set_ops' drivers/built-in.o: In function `easycap_alsa_probe': (.text+0x2b795b): undefined reference to `snd_card_register' drivers/built-in.o: In function `easycap_alsa_probe': (.text+0x2b79d8): undefined reference to `snd_card_free' drivers/built-in.o: In function `easycap_alsa_probe': (.text+0x2b7a78): undefined reference to `snd_card_free' drivers/built-in.o: In function `easycap_alsa_complete': (.text+0x2b7e68): undefined reference to `snd_pcm_period_elapsed' drivers/built-in.o:(.data+0x2cae8): undefined reference to `snd_pcm_lib_ioctl' Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: R.M. Thomas <rmthomas@sciolus.org> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-04staging/easycap: add level 1 tabs in usb_probe/disconnect functionTomas Winkler
Add first level indentation before revamping the functions This of course breaks 80 characters limit but it will be fixed through the revamp Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-04stagine/easycap: make easyoss_fops staticTomas Winkler
easyoss_fops are only accessed from within easycap_sound_oss file Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-04staging/easycap: kill declaration of not existing variablesTomas Winkler
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-04staging/easycap: don't shadow rc variable from macrosTomas Winkler
rc is used extensively in code as return code variable so it is better not shadowing it in macros Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-04staging/easycap: replace underscored types with regular onceTomas Winkler
the underscored types should be used in user space headers only Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-04staging/easycap: rename variable s16 to tmpTomas Winkler
naming variable s16 is confusing since it is also a type name. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-04staging/easycap: rename variable u8 to tmpTomas Winkler
naming variable u8 is confusing since it is also a type name. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-04staging/easycap: rename variable s32 to tmpTomas Winkler
1. naming variable s32 is confusing since it is also a type name. 2. use s32 instead of __s32, the later is for user space Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
generated by cgit v0.10.2 at 2024-07-21 01:16:14 (GMT)