2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-10 14:43:54 +08:00
Commit Graph

255178 Commits

Author SHA1 Message Date
Jesper Juhl
3b44d227f6 Remove unneeded version.h include from drivers/staging/wlan-ng/prism2sta.c
It was pointed out by 'make versioncheck' that include of
linux/version.h is not needed in drivers/staging/wlan-ng/prism2sta.c .
This patch removes it.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 10:39:38 -07:00
Jesper Juhl
7e978a115f Remove unneeded version.h includes from drivers/staging/xgifb/
It was pointed out by 'make versioncheck' that some includes of
linux/version.h are not needed in drivers/staging/xgifb/.
This patch removes them.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 10:39:37 -07:00
Ondrej Zary
7648c996ea staging: ft1000: Merge common definitions from USB and PCMCIA drivers
Merge common definitions from ft1000-usb and ft1000-pcmcia drivers to
a common ft1000.h file.
This revealed two odd things in ft1000-usb which might be bugs so add
comments about them to ft1000_usb.h.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 10:33:46 -07:00
Ondrej Zary
e161a440af staging: ft1000-pcmcia: remove support for v5 firmware
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-05 10:32:35 -07:00
Ondrej Zary
e1328c625c staging: ft1000-pcmcia: remove PSEUDOSZ, use sizeof(struct pseudo_hdr) instead
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-05 10:32:35 -07:00
Ondrej Zary
45c4cf1c06 staging: ft1000-pcmcia: CodingStyle fixes in ft1000.h
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-05 10:32:34 -07:00
Ondrej Zary
331eae6c84 staging: ft1000-pcmcia: remove useless ft1000_release() function
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-05 10:32:34 -07:00
Ondrej Zary
503b2d0eac staging: ft1000-pcmcia: remove unused includes from ft1000_cs.c
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-05 10:32:34 -07:00
Ondrej Zary
a6b0729186 staging: ft1000-pcmcia: coding style fixes in ft1000_cs.c
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-05 10:32:34 -07:00
Ondrej Zary
ba5e17e6ab staging: ft1000-pcmcia: remove unused ft1000_asic_read and ft1000_asic_write 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-05 10:32:34 -07:00
Ondrej Zary
3061fab152 staging: ft1000-pcmcia: remove misleading and template comments from ft1000_cs.c
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-05 10:32:34 -07:00
Ondrej Zary
5312ba3b1a staging: ft1000-pcmcia: remove useless debugging from ft1000_cs.c
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-05 10:32:33 -07:00
Ondrej Zary
3d5bc3ffb2 staging: ft1000-pcmcia: remove useless defines from ft1000_cs.c
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-05 10:32:33 -07:00
Ondrej Zary
ca145277fc staging: ft1000-pcmcia: remove custom defines for standard types
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-05 10:32:33 -07:00
Ondrej Zary
cefe8adb6f staging: ft1000-pcmcia: remove unused fields from struct ft1000_info
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-05 10:32:33 -07:00
Ondrej Zary
8e0fd2cfd9 staging: ft1000-pcmcia: remove firmware download typedefs
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-05 10:32:33 -07:00
Ondrej Zary
4370782ee2 staging: ft1000-pcmcia: delete local_info_t typedef
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-05 10:32:33 -07:00
Ondrej Zary
540c44fefd staging: ft1000-pcmcia: delete unused DPRAM_BLK typedefs
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-05 10:32:32 -07:00
Ondrej Zary
d3706552e6 staging: ft1000-pcmcia: remove FT1000_INFO typedefs
Remove FT1000_INFO typedefs.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 10:32:32 -07:00
Ondrej Zary
3aaf8073d9 staging: ft1000-pcmcia: remove PROV_RECORD typedefs
Remove PROV_RECORD typedefs.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 10:32:32 -07:00
Ondrej Zary
a8f0d231c6 staging: ft1000-pcmcia: delete unused APP_INFO_BLOCK typedefs
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-05 10:32:32 -07:00
Ondrej Zary
ba50587b75 staging: ft1000-pcmcia: delete unused DSPHIBERNATE typedefs
Delete unused DSPHIBERNATE typedefs.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 10:32:32 -07:00
Ondrej Zary
2cbdcdc15b staging: ft1000-pcmcia: remove DSPINITMSG typedefs
Remove DSPINITMSG typedefs.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 10:32:31 -07:00
Ondrej Zary
ed049d7fd4 staging: ft1000-pcmcia: delete unused TIMEMSG typedefs
Delete unused TIMEMSG typedefs.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 10:32:31 -07:00
Ondrej Zary
24c5b19ed6 staging: ft1000-pcmcia: remove MEDIAMSG typedefs
Remove MEDIAMSG typedefs.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 10:32:31 -07:00
Ondrej Zary
8bc0d6fb39 staging: ft1000-pcmcia: remove DRVMSG typedefs
Remove DRVMSG typedefs.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 10:32:31 -07:00
Ondrej Zary
2c9bf83922 staging: ft1000-pcmcia: remove PSEUDO_HDR typedefs
Remove PSEUDO_HDR typedefs.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 10:32:31 -07:00
Ondrej Zary
8ac299853b staging: ft1000-pcmcia: get rid of ft1000_dev.h
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-05 10:32:31 -07:00
Ondrej Zary
f1fb1904c9 staging: ft1000-pcmcia: delete ft1000.conf
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-05 10:32:31 -07:00
Ondrej Zary
e1ef436e60 staging: ft1000-pcmcia: fix compilation with FT_DEBUG enabled
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-05 10:32:30 -07:00
Ondrej Zary
01cafa528d staging: ft1000-pcmcia: don't crash on load
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-05 10:32:30 -07:00
Kirill Smelkov
378af48333 staging/easycap: Fix bytesperline calculation
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-05 10:26:16 -07:00
Kirill Smelkov
59204031dd staging/easycap: PAGE_SIZE is always defined
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-05 10:26:16 -07:00
Kirill Smelkov
bad269262c staging/easycap: There is no need to support V4L1 ioctls
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-05 10:26:16 -07:00
Kirill Smelkov
eb4cfaba54 staging/easycap: Fix thinko in "bars" module option description
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-05 10:26:16 -07:00
Kirill Smelkov
3efad93d39 staging/easycap: Kill leftover build options in readme
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-05 10:26:16 -07:00
Michael Fiedler
baaa790198 staging: rtl8712: Add missing whitespace in struct definition
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-05 10:23:57 -07:00
Michael Fiedler
d4aa57f0e1 staging: rtl8712: Use linux/atomic.h instead of asm/atomic.h
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-05 10:23:57 -07:00
Michael Fiedler
40878364f1 staging: rtl8712: Use __packed instead of __attribute__ ((packed))
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-05 10:23:57 -07:00
Michael Fiedler
36e0b743d2 staging: rtl8712: Remove duplicate #define for __attribute__ ((packed))
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-05 10:23:57 -07:00
Dan Carpenter
38d0cffefd Staging: easycap: use after free in easycap_delete()
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-05 10:22:50 -07:00
Tobias Klauser
981aabb148 Staging: usbip: Fix out-of-tree build for userspace
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-05 10:22:50 -07:00
Zac Storer
7d51b77ae1 Staging: keucr: usb: fixed a brace coding style warning
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-05 10:20:24 -07:00
Larry Finger
1c50bf7e41 staging: r8192e_pci: Handle duplicate PCI ID 0x10ec:0x8192 conflict with 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-05 10:20:23 -07:00
Wanlong Gao
ad3a245c35 drivers:rtl8192u:remove the use of obsolete create_workqueue in 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-05 10:19:40 -07:00
Wanlong Gao
2e8b6b4785 drivers:rtl8192u:remove the use of obsolete create_workqueue in r8192U_core.c
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-05 10:19:40 -07:00
Wanlong Gao
bf8996dc24 drivers:rtl8187se:remove the use of obsolete create_workqueue in 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-05 10:19:40 -07:00
Joe Perches
d5a76f3351 staging: transciever/transceiver spelling fixes
Just tyops.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-07-05 10:19:40 -07:00
Tobias Klauser
b95d2117e1 Staging: altera-stapl: Remove superfluous comment from Kconfig
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-05 10:19:13 -07:00
Jerome Marchand
c5bde2388e Staging: zram: Replace mutex lock by a R/W semaphore
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-05 10:07:13 -07:00