Eric Lee / smarc-fsl-linux-kernel

24 Nov, 2011

1 commit

  • 12cbfd0a3   Merge tag 'v3.2-rc2' into staging/for_v3.3 ... Browse Code »

    * tag 'v3.2-rc2': (3068 commits)
    Linux 3.2-rc2
    hfs: add sanity check for file name length
    fsl-rio: fix compile error
    blackfin: Fixup export.h includes
    Blackfin: add serial TX IRQ in individual platform resource
    virtio-pci: fix use after free
    ACPI / cpuidle: Remove acpi_idle_suspend (to fix suspend regression)
    drm/radeon/kms/combios: fix dynamic allocation of PM clock modes
    [CPUFREQ] db8500: fix build error due to undeclared i variable
    bma023: Add SFI translation for this device
    vrtc: change its year offset from 1960 to 1972
    ce4100: fix a build error
    arm/imx: fix imx6q mmc error when mounting rootfs
    arm/imx: fix AUTO_ZRELADDR selection
    arm/imx: fix the references to ARCH_MX3
    ARM: mx51/53: set pwm clock parent to ipg_perclk
    btrfs: rename the option to nospace_cache
    drm/radeon/kms/pm: switch to dynamically allocating clock mode array
    drm/radeon/kms: optimize r600_pm_profile_init
    drm/radeon/kms/pm: add a proper pm profile init function for fusion
    ...

    Conflicts:
    drivers/media/radio/Kconfig

    Mauro Carvalho Chehab
     

08 Nov, 2011

1 commit

  • 819cd82b0   [media] usbvision: Drop broken 10-bit I2C address support ... Browse Code »

    The support for 10-bit I2C addresses in usbvision seems plain broken
    to me. I had already noticed that back in February 2007 [1]. The code
    was not fixed since then, so I take it that it's not actually needed.
    And as a matter of fact I don't know of any 10-bit addressed I2C
    tuner, encode, decoder or the like.

    So let's simply get rid of the broken and useless code.

    I'm also adding I2C_FUNC_I2C, as the driver and hardware support plain
    I2C messaging.

    [1] http://marc.info/?l=linux-i2c&m=117499415208244&w=2

    Signed-off-by: Jean Delvare
    Signed-off-by: Mauro Carvalho Chehab

    Jean Delvare
     

07 Nov, 2011

1 commit

  • 32aaeffbd   Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux ... Browse Code »

    * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
    Revert "tracing: Include module.h in define_trace.h"
    irq: don't put module.h into irq.h for tracking irqgen modules.
    bluetooth: macroize two small inlines to avoid module.h
    ip_vs.h: fix implicit use of module_get/module_put from module.h
    nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
    include: replace linux/module.h with "struct module" wherever possible
    include: convert various register fcns to macros to avoid include chaining
    crypto.h: remove unused crypto_tfm_alg_modname() inline
    uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
    pm_runtime.h: explicitly requires notifier.h
    linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
    miscdevice.h: fix up implicit use of lists and types
    stop_machine.h: fix implicit use of smp.h for smp_processor_id
    of: fix implicit use of errno.h in include/linux/of.h
    of_platform.h: delete needless include
    acpi: remove module.h include from platform/aclinux.h
    miscdevice.h: delete unnecessary inclusion of module.h
    device_cgroup.h: delete needless include
    net: sch_generic remove redundant use of
    net: inet_timewait_sock doesnt need
    ...

    Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
    - drivers/media/dvb/frontends/dibx000_common.c
    - drivers/media/video/{mt9m111.c,ov6650.c}
    - drivers/mfd/ab3550-core.c
    - include/linux/dmaengine.h

    Linus Torvalds
     

01 Nov, 2011

1 commit

04 Sep, 2011

1 commit

  • 3f5c14d3d   [media] drivers/media: do not use EXTRA_CFLAGS ... Browse Code »

    Usage of these flags has been deprecated for nearly 4 years by:

    commit f77bf01425b11947eeb3b5b54685212c302741b8
    Author: Sam Ravnborg
    Date: Mon Oct 15 22:25:06 2007 +0200

    kbuild: introduce ccflags-y, asflags-y and ldflags-y

    Moreover, these flags (at least EXTRA_CFLAGS) have been documented for command
    line use. By default, gmake(1) do not override command line setting, so this is
    likely to result in build failure or unexpected behavior.

    Replace their usage by Kbuild's `{as,cc,ld}flags-y'.

    Cc: Sam Ravnborg
    Cc: Mauro Carvalho Chehab
    Cc: linux-media@vger.kernel.org
    Signed-off-by: Arnaud Lacombe
    Acked-by: Laurent Pinchart
    Signed-off-by: Mauro Carvalho Chehab

    Arnaud Lacombe
     

28 Jul, 2011

1 commit

  • 1990d50b5   [media] Stop using linux/version.h on most video drivers ... Browse Code »

    All the modified drivers didn't have any version increment since
    Jan, 1 2011. Several of them didn't have any version increment
    for a long time, even having new features and important bug fixes
    happening.

    As we're now filling the QUERYCAP version with the current Kernel
    Release, we don't need to maintain a per-driver version control
    anymore. So, let's just use the default.

    In order to preserve the Kernel module version history, a
    KERNEL_VERSION() macro were added to all modified drivers, and
    the extraver number were incremented.

    I opted to preserve the per-driver version control to a few
    pwc, pvrusb2, s2255, s5p-fimc and sh_vou.

    A few drivers are still using the legacy way to handle ioctl's.
    So, we can't do such change on them, otherwise, they'll break.
    Those are: uvc, et61x251 and sn9c102.

    The rationale is that the per-driver version control seems to be
    actively maintained on those.

    Yet, I think that the better for them would be to just use the
    default version numbering, instead of doing that by themselves.

    While here, removed a few uneeded include linux/version.h

    Acked-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     

24 May, 2011

1 commit

  • df462b3db   Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 ... Browse Code »

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (247 commits)
    [media] gspca - sunplus: Fix some warnings and simplify code
    [media] gspca: Fix some warnings tied to 'no debug'
    [media] gspca: Unset debug by default
    [media] gspca - cpia1: Remove a bad conditional compilation instruction
    [media] gspca - main: Remove USB traces
    [media] gspca - main: Version change to 2.13
    [media] gspca - stk014 / t613: Accept the index 0 in querymenu
    [media] gspca - kinect: Remove __devinitdata
    [media] gspca - cpia1: Fix some warnings
    [media] video/Kconfig: Fix mis-classified devices
    [media] support for medion dvb stick 1660:1921
    [media] tm6000: fix uninitialized field, change prink to dprintk
    [media] cx231xx: Add support for Iconbit U100
    [media] saa7134 add new TV cards
    [media] Use a more consistent value for RC repeat period
    [media] cx18: Move spinlock and vb_type initialisation into stream_init
    [media] tm6000: remove tm6010 sif audio start and stop
    [media] tm6000: remove unused exports
    [media] tm6000: add pts logging
    [media] tm6000: change from ioctl to unlocked_ioctl
    ...

    Linus Torvalds
     

20 May, 2011

2 commits

  • 59983439c   [media] usbvision: remove broken testpattern ... Browse Code »

    Enabling force_testpattern module parameter in usbvision causes kernel panic.
    Things like that does not belong to the kernel anyway so the fix is easy.

    Signed-off-by: Ondrej Zary
    Signed-off-by: Mauro Carvalho Chehab

    Ondrej Zary
     
  • 240d57bb8   [media] usbvision: add Nogatech USB MicroCam ... Browse Code »

    Add Nogatech USB MicroCam PAL (NV3001P) and NTSC (NV3000N) support to
    usbvision driver.
    PAL version is tested, NTSC untested.
    Data captured using usbsnoop, init_values are listed in the INF file along
    with image dimensions, offsets and frame rates.

    Signed-off-by: Ondrej Zary
    Signed-off-by: Mauro Carvalho Chehab

    Ondrej Zary
     

26 Apr, 2011

1 commit

  • 85ee7a1d3   treewide: cleanup continuations and remove logging message whitespace ... Browse Code »

    Using C line continuation inside format strings is error prone.
    Clean up the unintended whitespace introduced by misuse of \.
    Neaten correctly used line continations as well for consistency.

    drivers/scsi/arcmsr/arcmsr_hba.c has these errors as well,
    but arcmsr needs a lot more work and the driver should likely be
    moved to staging instead.

    Signed-off-by: Joe Perches
    Acked-by: Randy Dunlap
    Signed-off-by: Jiri Kosina

    Joe Perches
     

30 Dec, 2010

4 commits

29 Dec, 2010

1 commit

03 Dec, 2010

1 commit

22 Nov, 2010

1 commit

18 Nov, 2010

1 commit

23 Oct, 2010

1 commit

21 Oct, 2010

1 commit

  • 8403472f1   V4L/DVB: usbvision: remove BKL from usbvision ... Browse Code »

    Removed the BKL from usbvision.

    There was an initialization bug as well where the i2c bus was registered twice.

    Although when the BKL was present no oops was generated, I did run into
    other i2c problems. Now that I protect against duplicate i2c registration
    that bug is now gone as well.

    But trying to disconnect the USB cable while someone is still using the device
    still leads to a crash.

    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     

01 Jun, 2010

1 commit

  • 4202066c6   V4L/DVB: drivers/media: Eliminate a NULL pointer dereference ... Browse Code »

    In each case, the print involves dereferencing a value that is NULL or is
    near NULL.

    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @r exists@
    expression E,E1;
    identifier f;
    statement S1,S2,S3;
    @@

    if ((E == NULL && ...) || ...)
    {
    ... when != if (...) S1 else S2
    when != E = E1
    * E->f
    ... when any
    return ...;
    }
    else S3
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Mauro Carvalho Chehab

    Julia Lawall
     

21 May, 2010

2 commits

  • 7a9b14921   Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
    USB: remove unused usb_buffer_alloc and usb_buffer_free macros
    usb: musb: update gfp/slab.h includes
    USB: ftdi_sio: fix legacy SIO-device header
    USB: kl5usb105: reimplement using generic framework
    USB: kl5usb105: minor clean ups
    USB: kl5usb105: fix memory leak
    USB: io_ti: use kfifo to implement write buffering
    USB: io_ti: remove unsused private counter
    USB: ti_usb: use kfifo to implement write buffering
    USB: ir-usb: fix incorrect write-buffer length
    USB: aircable: fix incorrect write-buffer length
    USB: safe_serial: straighten out read processing
    USB: safe_serial: reimplement read using generic framework
    USB: safe_serial: reimplement write using generic framework
    usb-storage: always print quirks
    USB: usb-storage: trivial debug improvements
    USB: oti6858: use port write fifo
    USB: oti6858: use kfifo to implement write buffering
    USB: cypress_m8: use kfifo to implement write buffering
    USB: cypress_m8: remove unused drain define
    ...

    Fix up conflicts (due to usb_buffer_alloc/free renaming) in
    drivers/input/tablet/acecad.c
    drivers/input/tablet/kbtab.c
    drivers/input/tablet/wacom_sys.c
    drivers/media/video/gspca/gspca.c
    sound/usb/usbaudio.c

    Linus Torvalds
     
  • 997ea58eb   USB: rename usb_buffer_alloc() and usb_buffer_free() users ... Browse Code »

    For more clearance what the functions actually do,

    usb_buffer_alloc() is renamed to usb_alloc_coherent()
    usb_buffer_free() is renamed to usb_free_coherent()

    They should only be used in code which really needs DMA coherency.

    All call sites have been changed accordingly, except for staging
    drivers.

    Signed-off-by: Daniel Mack
    Cc: Alan Stern
    Cc: Pedro Ribeiro
    Signed-off-by: Greg Kroah-Hartman

    Daniel Mack
     

19 May, 2010

3 commits

30 Mar, 2010

1 commit

  • 5a0e3ad6a   include cleanup: Update gfp.h and slab.h includes to prepare for breaking implic… ... Browse Code »

    …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

27 Feb, 2010

1 commit

  • 3557aa4f7   V4L/DVB (13954): Correct NULL test ... Browse Code »

    Test the just-allocated value for NULL rather than some other value.

    The semantic patch that makes this change is as follows:
    (http://coccinelle.lip6.fr/)

    //
    @r@
    identifier f;
    @@

    f(...) { }

    @@
    expression *x;
    expression y;
    identifier r.f;
    statement S;
    @@

    x = f(...);
    (
    if ((x) == NULL) S
    |
    if (
    - y
    + x
    == NULL)
    S
    )
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Mauro Carvalho Chehab

    Julia Lawall
     

16 Dec, 2009

4 commits

06 Dec, 2009

1 commit

24 Sep, 2009

1 commit

  • 2bcd57ab6   headers: utsname.h redux ... Browse Code »

    * remove asm/atomic.h inclusion from linux/utsname.h --
    not needed after kref conversion
    * remove linux/utsname.h inclusion from files which do not need it

    NOTE: it looks like fs/binfmt_elf.c do not need utsname.h, however
    due to some personality stuff it _is_ needed -- cowardly leave ELF-related
    headers and files alone.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     

19 Sep, 2009

1 commit

13 Jul, 2009

1 commit

  • 405f55712   headers: smp_lock.h redux ... Browse Code »

    * Remove smp_lock.h from files which don't need it (including some headers!)
    * Add smp_lock.h to files which do need it
    * Make smp_lock.h include conditional in hardirq.h
    It's needed only for one kernel_locked() usage which is under CONFIG_PREEMPT

    This will make hardirq.h inclusion cheaper for every PREEMPT=n config
    (which includes allmodconfig/allyesconfig, BTW)

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     

17 Jun, 2009

3 commits

07 Apr, 2009

1 commit