Doug / smarc-fsl-linux-kernel

07 Oct, 2012

1 commit

  • 5f07809e9   ARM: rpc: check device_register return code in ecard_probe ... Browse Code »

    device_register is marked __must_check, so we better propagate the error
    value by returning it from ecard_probe.

    Without this patch, building rpc_defconfig results in:

    arch/arm/mach-rpc/ecard.c: In function 'ecard_probe':
    arch/arm/mach-rpc/ecard.c:963:17: warning: ignoring return value of 'device_register', declared with attribute warn_unused_result [-Wunused-result]

    Signed-off-by: Arnd Bergmann
    Cc: Russell King

    Arnd Bergmann
     

28 Mar, 2012

1 commit

  • 9e4db1c3e   Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm ... Browse Code »

    Pull ARM platform updates from Russell King:
    "This covers platform stuff for platforms I have a direct interest in
    (iow, I have the hardware). Essentially:
    - as we no longer support any other Acorn platforms other than RiscPC
    anymore, we can collect all that code into mach-rpc.
    - convert Acorn expansion card stuff to use IRQ allocation functions,
    and get rid of NO_IRQ from there.
    - cleanups to the ebsa110 platform to move some private stuff out of
    its header files.
    - large amount of SA11x0 updates:
    - conversion of private DMA implementation to DMA engine support
    (this actually gives us greater flexibility in drivers over the old
    API.)
    - re-worked ucb1x00 updates - convert to genirq, remove sa11x0
    dependencies, fix various minor issues
    - move platform specific sa11x0 framebuffer data into platform files
    in arch/arm instead of keeping this in the driver itself
    - update sa11x0 IrDA driver for DMA engine, and allow it to use DMA
    for SIR transmissions as well as FIR
    - rework sa1111 support for genirq, and irq allocation
    - fix sa1111 IRQ support so it works again
    - use sparse IRQ support

    After this, I have one more pull request remaining from my current
    set, which I think is going to be the most problematical as it
    generates 8 conflicts."

    Fixed up the trivial conflict in arch/arm/mach-rpc/Makefile as per
    Russell.

    * 'platforms' of git://git.linaro.org/people/rmk/linux-arm: (125 commits)
    ARM: 7343/1: sa11x0: convert to sparse IRQ
    ARM: 7342/2: sa1100: prepare for sparse irq conversion
    ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irq
    ARM: 7340/1: rtc: sa1100: include mach/irqs.h instead of asm/irq.h
    ARM: sa11x0: remove unused DMA controller definitions
    ARM: sa11x0: remove old SoC private DMA driver
    USB: sa1111: add hcd .reset method
    USB: sa1111: add OHCI shutdown methods
    USB: sa1111: reorganize ohci-sa1111.c
    USB: sa1111: get rid of nasty printk(KERN_DEBUG "%s: ...", __FILE__)
    USB: sa1111: sparse and checkpatch cleanups
    ARM: sa11x0: don't static map sa1111
    ARM: sa1111: use dev_err() rather than printk()
    ARM: sa1111: cleanup sub-device registration and unregistration
    ARM: sa1111: only setup DMA for DMA capable devices
    ARM: sa1111: register sa1111 devices with dmabounce in bus notifier
    ARM: sa1111: move USB interface register definitions to ohci-sa1111.c
    ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c
    ARM: sa1111: move PS/2 interface register definitions to sa1111p2.c
    ARM: sa1111: delete unused physical GPIO register definitions
    ...

    Linus Torvalds
     

24 Mar, 2012

5 commits