Eric Lee / smarc-fsl-linux-kernel

27 Nov, 2011

1 commit

26 Oct, 2011

1 commit

  • aa77677e0   Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging ... Browse Code »

    * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
    staging: et131x: Remove redundant check and return statement
    staging: et131x: Mainly whitespace changes to appease checkpatch
    staging: et131x: Remove last of the forward declarations
    staging: et131x: Remove even more forward declarations
    staging: et131x: Remove yet more forward declarations
    staging: et131x: Remove more forward declarations
    staging: et131x: Remove forward declaration of et131x_adapter_setup
    staging: et131x: Remove some forward declarations
    staging: et131x: Remove unused rx_ring.recv_packet_pool
    staging: et131x: Remove call to find pci pm capability
    staging: et131x: Remove redundant et131x_reset_recv() call
    staging: et131x: Remove unused rx_ring.recv_buffer_pool
    Staging: bcm: Fix three initialization errors in InterfaceDld.c
    Staging: bcm: Fix coding style issues in InterfaceDld.c
    staging:iio:dac: Add AD5360 driver
    staging:iio:trigger:bfin-timer: Fix compile error
    Staging: vt6655: add some range checks before memcpy()
    Staging: vt6655: whitespace fixes to iotcl.c
    Staging: vt6656: add some range checks before memcpy()
    Staging: vt6656: whitespace cleanups in ioctl.c
    ...

    Fix up conflicts in:
    - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
    vg driver movement
    - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
    driver removal vs now stale changes
    - drivers/staging/rtl8192e/r8192E_core.c:
    driver removal vs now stale changes
    - drivers/staging/et131x/et131*:
    driver consolidation into one file, tried to do fixups

    Linus Torvalds
     

19 Oct, 2011

1 commit

24 Aug, 2011

2 commits

21 Aug, 2011

1 commit

18 Aug, 2011

1 commit

03 Aug, 2011

1 commit

26 Jul, 2011

1 commit

  • 138051659   Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 ... Browse Code »

    * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
    staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
    staging:iio:kfifo_buf fix double initialization of the ring device structure.
    staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
    staging:iio:imu fix missing register table index for some channels
    spectra: enable device before poking it
    staging: rts_pstor: Fix a miswriting
    staging/lirc_bt829: Return -ENODEV when no hardware is found.
    staging/lirc_parallel: remove pointless prototypes.
    staging/lirc_parallel: fix panic on rmmod
    staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
    Staging: zram: Fix kunmapping order
    Revert "gma500: Fix dependencies"
    gma500: Add medfield header
    gma500: wire up the mrst i2c bus from chip_info
    gma500: Fix DPU build
    gma500: Clean up the DPU config and make it runtime
    gma500: resync with Medfield progress
    gma500: Use the mrst helpers and power control for mode commit
    gma500@ Fix backlight range error
    gma500: More Moorestown muddle meddling means MM maybe might modeset
    ...

    Fix up fairly trivial conflicts all over, mostly due to header file
    cleanup conflicts, but some deleted files and some just context changes:
    - Documentation/feature-removal-schedule.txt
    - drivers/staging/bcm/headers.h
    - drivers/staging/brcm80211/brcmfmac/dhd_linux.c
    - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
    - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
    - drivers/staging/brcm80211/brcmfmac/wl_iw.c
    - drivers/staging/et131x/et131x_netdev.c
    - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
    - drivers/staging/rtl8192e/r8192E.h
    - drivers/staging/usbip/userspace/src/utils.h

    Linus Torvalds
     

24 Jul, 2011

1 commit

09 Jul, 2011

1 commit

06 Jul, 2011

4 commits

20 Jun, 2011

1 commit

  • 219eb47e6   net/staging: add needed interrupt.h and hardirq.h includes ... Browse Code »

    Made necessary by commit a6b7a407865a ("net: remove
    interrupt.h inclusion from netdevice.h").

    Fixes these build errors:

    drivers/staging/brcm80211/brcmfmac/dhd_linux.c:1212:3: error: implicit declaration of function 'in_interrupt'
    drivers/staging/brcm80211/brcmfmac/dhd_linux.c:1390:4: error: implicit declaration of function 'tasklet_schedule'
    drivers/staging/brcm80211/brcmfmac/dhd_linux.c:1988:3: error: implicit declaration of function 'tasklet_init'
    drivers/staging/brcm80211/brcmfmac/dhd_linux.c:2288:5: error: implicit declaration of function 'tasklet_kill'
    drivers/staging/brcm80211/brcmfmac/dhd_linux.c:232:24: error: field 'tasklet' has incomplete type
    drivers/staging/brcm80211/brcmfmac/wl_iw.c:3670:2: error: implicit declaration of function 'in_interrupt'
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:1349:3: error: implicit declaration of function 'free_irq'
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:1352:2: error: implicit declaration of function 'tasklet_kill'
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:1538:4: error: implicit declaration of function 'tasklet_schedule'
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:765:2: error: implicit declaration of function 'tasklet_init'
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:817:2: error: implicit declaration of function 'request_irq'
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.c:817:31: error: 'IRQF_SHARED' undeclared (first use in this function)
    drivers/staging/brcm80211/brcmsmac/wl_mac80211.h:65:24: error: field 'tasklet' has incomplete type
    drivers/staging/rtl8187se/ieee80211/ieee80211.h:994:24: error: field 'ps_task' has incomplete type
    drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c:1790:3: error: implicit declaration of function 'tasklet_schedule'
    drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c:2590:2: error: implicit declaration of function 'tasklet_init'
    drivers/staging/rtl8187se/r8180.h:461:24: error: field 'irq_rx_tasklet' has incomplete type
    drivers/staging/rtl8187se/r8180_core.c:2764:2: error: implicit declaration of function 'tasklet_init'
    drivers/staging/rtl8187se/r8180_core.c:2954:2: error: implicit declaration of function 'request_irq'
    drivers/staging/rtl8187se/r8180_core.c:2954:55: error: 'IRQF_SHARED' undeclared (first use in this function)
    drivers/staging/rtl8187se/r8180_core.c:3641:4: error: implicit declaration of function 'free_irq'
    drivers/staging/rtl8187se/r8180_core.c:4026:3: error: implicit declaration of function 'tasklet_schedule'
    drivers/staging/rtl8192e/ieee80211/ieee80211.h:2000:24: error: field 'ps_task' has incomplete type
    drivers/staging/rtl8192e/r8192E.h:909:24: error: field 'irq_rx_tasklet' has incomplete type
    drivers/staging/rtl8192e/r8192E.h:910:24: error: field 'irq_tx_tasklet' has incomplete type
    drivers/staging/rtl8192e/r8192E.h:911:31: error: field 'irq_prepare_beacon_tasklet' has incomplete type
    drivers/staging/rtl8192e/r8192E_core.c:2008:2: error: implicit declaration of function 'tasklet_init'
    drivers/staging/rtl8192e/r8192E_core.c:2412:54: error: 'IRQF_SHARED' undeclared (first use in this function)
    drivers/staging/rtl8192e/r8192E_core.c:2412:9: error: implicit declaration of function 'request_irq'
    drivers/staging/rtl8192e/r8192E_core.c:4640:4: error: implicit declaration of function 'free_irq'
    drivers/staging/rtl8192e/r8192E_core.c:620:2: error: implicit declaration of function 'synchronize_irq'
    drivers/staging/rtl8192e/r8192E_core.c:913:3: error: implicit declaration of function 'tasklet_schedule'
    drivers/staging/rtl8192u/ieee80211/ieee80211.h:1993:24: error: field 'ps_task' has incomplete type

    Signed-off-by: Stephen Rothwell
    Signed-off-by: David S. Miller

    Stephen Rothwell
     

08 Apr, 2011

1 commit

  • df9b29d13   Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 ... Browse Code »

    * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (28 commits)
    staging: usbip: bugfix for isochronous packets and optimization
    staging: usbip: bugfix add number of packets for isochronous frames
    staging: usbip: bugfixes related to kthread conversion
    staging: usbip: fix shutdown problems.
    staging: hv: Fix GARP not sent after Quick Migration
    staging: IIO: IMU: ADIS16400: Avoid using printk facility directly
    staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision number
    staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed into the ring
    staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offset
    staging: IIO: IMU: ADIS16400: Add delay after self test
    staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behavior
    staging/rtl81*: build as loadable modules only
    staging: brcm80211: removed 'is_amsdu causing toss' log spam
    staging: brcm80211: fix for 'Short CCK' log spam
    staging: brcm80211: fix for 'AC_BE txop..' logs spammed problem
    staging: memrar: remove driver from tree
    staging: sep: remove last memrar remnants
    staging: fix hv_mouse build, needs delay.h
    staging: fix olpc_dcon build errors
    staging: sm7xx: fixed defines
    ...

    Fix up trivial conflict in drivers/staging/memrar/memrar_handler.c
    (deleted vs trivial spelling fixes)

    Linus Torvalds
     

05 Apr, 2011

1 commit

  • 84ba253b0   staging/rtl81*: build as loadable modules only ... Browse Code »

    These 3 drivers contain much duplicated (triplicated) code, so
    building them as built-in results in many errors like:

    (.text+0x1b160): multiple definition of `ieee80211_sta_ps_sleep'

    Prevent this configuration by making them all buildable only as
    loadable modules (similar to the vt665[56] patch last week).

    Signed-off-by: Randy Dunlap
    Signed-off-by: Greg Kroah-Hartman

    Randy Dunlap
     

31 Mar, 2011

1 commit

15 Mar, 2011

1 commit

22 Jan, 2011

1 commit

11 Dec, 2010

1 commit

02 Dec, 2010

2 commits

  • b83451757   Staging: rtl8192u: check return code kmalloc. ... Browse Code »

    This patch checks the return code of kmalloc when trying to allocate
    memory for priv->rx_urb in rtl8192_usb_initendpoints(), return -ENOMEM
    when failed.

    Signed-off-by: David Chosrova
    Signed-off-by: Greg Kroah-Hartman

    David Chosrova
     
  • 0e7a3e7a7   Staging: rtl8192u: remove dead code to disable dot11d ... Browse Code »

    This patch removes all the ENABLE_DOT11D ifdefs.
    It is always defined for driver. DOT11D has to do with regulatory domains.

    What prompted this patch was a warning message in Sparse.

    drivers/staging/rtl8192u/r8192U_core.c:247:1: warning: "eqMacAddr"
    redefined in file included from drivers/staging/rtl8192u/:81:81:
    drivers/staging/rtl8192u/dot11d.h:35:1: warning: this is the location
    of the previous definition

    Now there are no ifdefs around dot11d.h it made no sense to have this
    second definition, so I removed that macro as well. ( Thanks Dan ;-) ).

    Acked-by. Dan Carpenter
    Signed-off-by: David Chosrova
    Signed-off-by: Greg Kroah-Hartman

    David Chosrova
     

17 Nov, 2010

1 commit

10 Nov, 2010

1 commit

08 Oct, 2010

1 commit

06 Oct, 2010

2 commits

06 Sep, 2010

1 commit

05 Sep, 2010

1 commit

01 Sep, 2010

2 commits

  • 4498dbcd2   staging: rtl8193*: Remove double test ... Browse Code »

    The 1 element of the array is tested twice. Change the code so that the
    remaining 3 element of the array is tested instead of testing the 1 element
    a second time.

    The sematic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)

    //
    @expression@
    expression E;
    @@

    (
    * E
    || ... || E
    |
    * E
    && ... && E
    )
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Greg Kroah-Hartman

    Julia Lawall
     
  • 39831861f   Staging: rtl81*: Fix spelling fuction -> function in comments ... Browse Code »

    Obviously the wrong spelling was copied a lot of times.

    A similar patch for the non-staging part of linux
    is committed by Jiri Kosina.

    Cc: devel@driverdev.osuosl.org
    Signed-off-by: Stefan Weil
    Signed-off-by: Greg Kroah-Hartman

    Stefan Weil
     

06 Aug, 2010

1 commit

09 Jul, 2010

2 commits

  • f079bc302   Staging: rtl8192u: use ARRAY_SIZE ... Browse Code »

    Change sizeof(x) / sizeof(*x) to ARRAY_SIZE(x).

    Signed-off-by: Kulikov Vasiliy
    Signed-off-by: Greg Kroah-Hartman

    Kulikov Vasiliy
     
  • 2addf798e   Staging: rtl8192u: remove a copy of 80211.h ... Browse Code »

    We had a request to enable one of the realtek network drivers in staging in Fedora.
    After a quick lookover, I decided this wasn't such a great idea.

    In doing so though, I noticed we have 6 copies of ieee80211.h there now,
    Two drivers even have two copies of it. (Even worse, cleanups have been pointlessly
    happening to both files). The patch below removes one of them, which is asides
    from whitespace, identical afaics. With a change of filename to the #include,
    it all still compiles for me.

    A better fix would be to remove both, and have them use the core ieee80211 stuff,
    but this is at least a tiny step in the right direction.

    Signed-off-by: Dave Jones
    Signed-off-by: Greg Kroah-Hartman

    Dave Jones
     

30 Jun, 2010

1 commit

19 Jun, 2010

2 commits

  • 616f58f6e   staging: rtl8192u: fix checkpatch.pl issues to line 514 ... Browse Code »

    Fixed most problems pointed out by checkpatch.pl in file r8192U_core.c
    up to line 500

    Signed-off-by: Mike Gilks
    Signed-off-by: Greg Kroah-Hartman

    Mike Gilks
     
  • 0374e91c9   Staging: rtl81xx: Fix build problems when CONFIG_CRYPTO=n ... Browse Code »

    Select CONFIG_CRYPTO for all rtl81xx wireless drivers

    ... to avoid build problems like:

    ERROR: "crypto_destroy_tfm" [drivers/staging/rtl8187se/r8187se.ko] undefined!
    ERROR: "crypto_alloc_base" [drivers/staging/rtl8187se/r8187se.ko] undefined!
    ERROR: "crypto_destroy_tfm" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
    ERROR: "crypto_alloc_base" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
    ERROR: "crypto_destroy_tfm" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
    ERROR: "crypto_alloc_base" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
    ERROR: "crypto_destroy_tfm" [drivers/staging/rtl8192e/r8192e_pci.ko] undefined!
    ERROR: "crypto_alloc_base" [drivers/staging/rtl8192e/r8192e_pci.ko] undefined!

    when drivers are built as modules but CONFIG_CRYPTO=n.

    Signed-off-by: Andreas Herrmann
    Signed-off-by: Greg Kroah-Hartman

    Andreas Herrmann
     

18 May, 2010

1 commit

  • 94002c07f   Staging: Use kmemdup ... Browse Code »

    Use kmemdup when some other buffer is immediately copied into the
    allocated region.

    A simplified version of the semantic patch that makes this change is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @@
    expression from,to,size,flag;
    statement S;
    @@

    - to = \(kmalloc\|kzalloc\)(size,flag);
    + to = kmemdup(from,size,flag);
    if (to==NULL || ...) S
    - memcpy(to, from, size);
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Greg Kroah-Hartman

    Julia Lawall