summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-07-05staging: ft1000-pcmcia: remove support for v5 firmwareOndrej Zary
Remove support for v5 firmware images as all known firmware images are v6. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove PSEUDOSZ, use sizeof(struct pseudo_hdr) insteadOndrej Zary
PSEUDOSZ seems to define struct pseudo_hdr size. Remove it and use sizeof(struct pseudo_hdr) directly. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: CodingStyle fixes in ft1000.hOndrej Zary
Major CodingStyle fixes in ft1000.h Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove useless ft1000_release() functionOndrej Zary
Remove useless ft1000_release() function. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove unused includes from ft1000_cs.cOndrej Zary
Remove unused includes from ft1000_cs.c Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: coding style fixes in ft1000_cs.cOndrej Zary
Minor coding style fixes in ft1000_cs.c Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove unused ft1000_asic_read and ft1000_asic_write ↵Ondrej Zary
functions Functions ft1000_asic_read() and ft1000_asic_write() are unused. Remove them. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove misleading and template comments from ft1000_cs.cOndrej Zary
Remove misleading, useless and template comments from ft1000_cs.c Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove useless debugging from ft1000_cs.cOndrej Zary
Remove useless debugging from ft1000_cs.c Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove useless defines from ft1000_cs.cOndrej Zary
Remove unused defines from ft1000_cs.c Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove custom defines for standard typesOndrej Zary
Remove custom defines for standard types (u8, u16, u32...) Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove unused fields from struct ft1000_infoOndrej Zary
Remove 13 unused fields from struct ft1000_info. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove firmware download typedefsOndrej Zary
Remove firmware download typedefs: DFP_FILE_HDR, DSP_FILE_HDR_5, DSP_IMAGE_INFO, DSP_IMAGE_INFO_V6 Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: delete local_info_t typedefOndrej Zary
Delete local_info_t typedef along with the struct as its "link" member was not used. Use link->priv to store net_device directly. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: delete unused DPRAM_BLK typedefsOndrej Zary
Delete unused DPRAM_BLK typedefs. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove FT1000_INFO typedefsOndrej Zary
Remove FT1000_INFO typedefs. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove PROV_RECORD typedefsOndrej Zary
Remove PROV_RECORD typedefs. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: delete unused APP_INFO_BLOCK typedefsOndrej Zary
Delete unused APP_INFO_BLOCK typedefs and associated variables. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: delete unused DSPHIBERNATE typedefsOndrej Zary
Delete unused DSPHIBERNATE typedefs. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove DSPINITMSG typedefsOndrej Zary
Remove DSPINITMSG typedefs. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: delete unused TIMEMSG typedefsOndrej Zary
Delete unused TIMEMSG typedefs. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove MEDIAMSG typedefsOndrej Zary
Remove MEDIAMSG typedefs. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove DRVMSG typedefsOndrej Zary
Remove DRVMSG typedefs. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: remove PSEUDO_HDR typedefsOndrej Zary
Remove PSEUDO_HDR typedefs. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: get rid of ft1000_dev.hOndrej Zary
Shorten ft1000_read_reg() to single line and move it to ft1000.h along with ft1000_write_reg() and delete ft1000_dev.h Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: delete ft1000.confOndrej Zary
Remove useless ft1000.conf file. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: fix compilation with FT_DEBUG enabledOndrej Zary
Delete DEBUG statement that prevents compilation with FT_DEBUG enabled. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: ft1000-pcmcia: don't crash on loadOndrej Zary
Don't crash with NULL pointer dereference on load because of empty .name. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging/easycap: Fix bytesperline calculationKirill Smelkov
As described above fillin_formats() """ /* * THE 16-BIT easycap_format.mask HAS MEANING: * (least significant) BIT 0: 0 => PAL, 25 FPS; 1 => NTSC, 30 FPS * BITS 2-4: RESERVED FOR DIFFERENTIATING STANDARDS * BITS 5-7: NUMBER OF BYTES PER PIXEL * BIT 8: 0 => NATIVE BYTE ORDER; 1 => SWAPPED * BITS 9-10: RESERVED FOR OTHER BYTE PERMUTATIONS * BIT 11: 0 => UNDECIMATED; 1 => DECIMATED * BIT 12: 0 => OFFER FRAMES; 1 => OFFER FIELDS * BIT 13: 0 => FULL FRAMERATE; 1 => REDUCED * (most significant) BITS 14-15: RESERVED FOR OTHER FIELD/FRAME OPTIONS * IT FOLLOWS THAT: * bytesperpixel IS ((0x00E0 & easycap_format.mask) >> 5) * byteswaporder IS true IF (0 != (0x0100 & easycap_format.mask)) * * decimatepixel IS true IF (0 != (0x0800 & easycap_format.mask)) * * offerfields IS true IF (0 != (0x1000 & easycap_format.mask)) */ """ bytes-per-pixel is stored in bits 5-7 of calculated mask. But when calculating bytes-per-line we were extracting wrong value instead of bytes-per-pixel, which was usually 2 times bigger -- e.g. for PAL YUV 422 I was getting ((mask3 & 0x00F0) >> 4) = 4 bytes instead of 2. The error here is that even in comments there is a line saying * bytesperpixel IS ((0x00E0 & easycap_format.mask) >> 5) but we were using ((0x00F0 & easycap_format.mask) >> 4) With 2 times bigger bytesperpixel and automatically bytesperline, the video was shown halfheight'ed, which is understandable if we look at video-memory layout: <------- bytesperline --------> <- real bpl -> x0----------y0 x1-----------y1 x2----------y2 x3-----------y3 xn----------yn xn-----------yn <garbage> for each line, we should display width pixels, then move to next line with bytesperline, and oops, if bytesperline = 2*real-bytesperlin, we'll skip one line and move to next-next line, and so only half lines will be shown. Initially I've debugged the problem with my video application[1], but I've checked that after this patch both rawv (mine app) and tvtime work correctly. [1] http://repo.or.cz/w/rawv.git P.S. why at all we use those mask/shifts? Why not use bitfields? Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Acked-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging/easycap: PAGE_SIZE is always definedKirill Smelkov
I'm not 100% sure, only 99.99% that PAGE_SIZE is always defined in Linux. So there is no need to check for it. Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Acked-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging/easycap: There is no need to support V4L1 ioctlsKirill Smelkov
Because V4L1 was completly removed from the kernel in 2.6.38. See e.g. 08af245d ([media] V4L: remove V4L1 compatibility mode). Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Acked-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging/easycap: Fix thinko in "bars" module option descriptionKirill Smelkov
Both bars=0 and bars=1 were described as meaning to display bars on signal lost. Actually bars=1 means "display bars", but bars=0 means display raw source as is (usually black screen). Instead of changing bars=0 to "_no_ testcard bars ..." as suggested by Dan Carpenter reword the whole bars description for clarity. Cc: Mike Thomas <rmthomas@sciolus.org> Cc: Dan Carpenter <error27@gmail.com> Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Acked-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging/easycap: Kill leftover build options in readmeKirill Smelkov
The following options were removed from in-tree driver, but were left in README: - EASYCAP_IS_VIDEODEV_CLIENT was removed in cb81fa07 (staging/easycap: kill EASYCAP_IS_VIDEODEV_CLIENT compilation conditional); - EASYCAP_NEEDS_V4L2_DEVICE_H/EASYCAP_NEEDS_V4L2_FOPS were removed in 30516058 (staging/easycap: kill EASYCAP_NEEDS_V4L2_DEVICE_H and EASYCAP_NEEDS_V4L2_FOPS); - EASYCAP_NEEDS_UNLOCKED_IOCTL was removed in f2b3c685 (staging/easycap: kill EASYCAP_NEEDS_UNLOCKED_IOCTL). Remove them. Cc: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Acked-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: rtl8712: Add missing whitespace in struct definitionMichael Fiedler
Fixes scripts/checkpatch.pl warning. Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: rtl8712: Use linux/atomic.h instead of asm/atomic.hMichael Fiedler
Fixes warning from scripts/checkpatch.pl. Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: rtl8712: Use __packed instead of __attribute__ ((packed))Michael Fiedler
According to scripts/checkpatch.pl, the __packed macro from linux/compiler.h should be used. Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: rtl8712: Remove duplicate #define for __attribute__ ((packed))Michael Fiedler
There is already a macro defined in linux/compiler.h. Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05Staging: easycap: use after free in easycap_delete()Dan Carpenter
The JOM() macro dereferences peasycap, so I moved the free down some lines. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05Staging: usbip: Fix out-of-tree build for userspaceTobias Klauser
This fixes out-of-tree builds ($builddir != $srcdir). In such cases, libusbip.la cannot be found because it is generated in the build directory and not the source directory. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: matt mooney <mfm@muteddisk.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05Staging: keucr: usb: fixed a brace coding style warningZac Storer
Fixed a brace coding style warning. Signed-off-by: Zac Storer <zac.3.14159@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: r8192e_pci: Handle duplicate PCI ID 0x10ec:0x8192 conflict with ↵Larry Finger
rtl8192se There are two devices with PCI ID 0x10ec:0x8192, namely RTL8192E and RTL8192SE. The method of distinguishing them is by the revision ID at offset 0x8 of the PCI configuration space. If the value is 0x10, then the device uses rtl8192se for a driver. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: Stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05drivers:rtl8192u:remove the use of obsolete create_workqueue in ↵Wanlong Gao
ieee80211_softmac.c Remove the use of obsolete create_workqueue(name, 0) interface in ieee80211_softmac.c, since it has changed. Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05drivers:rtl8192u:remove the use of obsolete create_workqueue in r8192U_core.cWanlong Gao
Remove the use of obsolete create_workqueue(name, 0) interface in r8192U_core.c, since it has changed. Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05drivers:rtl8187se:remove the use of obsolete create_workqueue in ↵Wanlong Gao
ieee80211_softmac.c Remove the use of obsolete create_workqueue(name, 0) in ieee80211_softmac.c, since the create_workqueue interface has changed. Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05staging: transciever/transceiver spelling fixesJoe Perches
Just tyops. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05Staging: altera-stapl: Remove superfluous comment from KconfigTobias Klauser
Same text as for the config ALTERA_STAPL entry, so remove it. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05Staging: zram: Replace mutex lock by a R/W semaphoreJerome Marchand
Currently, nothing protects zram table from concurrent access. For instance, ZRAM_UNCOMPRESSED bit can be cleared by zram_free_page() called from a concurrent write between the time ZRAM_UNCOMPRESSED has been set and the time it is tested to unmap KM_USER0 in zram_bvec_write(). This ultimately leads to kernel panic. Also, a read request can occurs when the page has been freed by a running write request and before it has been updated, leading to zero filled block being incorrectly read and "Read before write" error message. This patch replace the current mutex by a rw_semaphore. It extends the protection to zram table (currently, only compression buffers are protected) and read requests (currently, only write requests are protected). Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05Staging: zram: allow partial page operationsJerome Marchand
Commit 7b19b8d45b216ff3186f066b31937bdbde066f08 (zram: Prevent overflow in logical block size) introduced ZRAM_LOGICAL_BLOCK_SIZE constant to prevent overflow of logical block size on 64k page kernel. However, the current implementation of zram only allow operation on block of the same size as a page. That makes theorically legit 4k requests fail on 64k page kernel. This patch makes zram allow operation on partial pages. Basically, it means we still do operations on full pages internally, but only copy the relevent segments from/to the user memory. Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05Staging: zram: Refactor zram_read/write() functionsJerome Marchand
This patch refactor the code of zram_read/write() functions. It does not removes a lot of duplicate code alone, but is mostly a helper for the third patch of this series (Staging: zram: allow partial page operations). Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05Staging: zram: Remove useless offset calculation in handle_uncompressed_page()Jerome Marchand
The offset of uncompressed page is always zero: handle_uncompressed_page() doesn't have to care about it. Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>