26 Jul, 2013

1 commit

  • We currently enable PCI bridges after scanning a bus and assigning
    resources. This is often done in arch code.

    This patch changes this so we don't enable a bridge until necessary, i.e.,
    until we enable a PCI device behind the bridge. We do this in the generic
    pci_enable_device() path, so this also removes the arch-specific code to
    enable bridges.

    [bhelgaas: changelog]
    Signed-off-by: Yinghai Lu
    Signed-off-by: Bjorn Helgaas

    Yinghai Lu
     

03 Jul, 2013

1 commit

  • Pull driver core updates from Greg KH:
    "Here's the big driver core merge for 3.11-rc1

    Lots of little things, and larger firmware subsystem updates, all
    described in the shortlog. Nice thing here is that we finally get rid
    of CONFIG_HOTPLUG, after 10+ years, thanks to Stephen Rohtwell (it had
    been always on for a number of kernel releases, now it's just
    removed)"

    * tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (27 commits)
    driver core: device.h: fix doc compilation warnings
    firmware loader: fix another compile warning with PM_SLEEP unset
    build some drivers only when compile-testing
    firmware loader: fix compile warning with PM_SLEEP set
    kobject: sanitize argument for format string
    sysfs_notify is only possible on file attributes
    firmware loader: simplify holding module for request_firmware
    firmware loader: don't export cache_firmware and uncache_firmware
    drivers/base: Use attribute groups to create sysfs memory files
    firmware loader: fix compile warning
    firmware loader: fix build failure with !CONFIG_FW_LOADER_USER_HELPER
    Documentation: Updated broken link in HOWTO
    Finally eradicate CONFIG_HOTPLUG
    driver core: firmware loader: kill FW_ACTION_NOHOTPLUG requests before suspend
    driver core: firmware loader: don't cache FW_ACTION_NOHOTPLUG firmware
    Documentation: Tidy up some drivers/base/core.c kerneldoc content.
    platform_device: use a macro instead of platform_driver_register
    firmware: move EXPORT_SYMBOL annotations
    firmware: Avoid deadlock of usermodehelper lock at shutdown
    dell_rbu: Select CONFIG_FW_LOADER_USER_HELPER explicitly
    ...

    Linus Torvalds
     

18 Jun, 2013

1 commit


09 Jun, 2013

1 commit


07 Jun, 2013

7 commits


04 Jun, 2013

1 commit

  • Ever since commit 45f035ab9b8f ("CONFIG_HOTPLUG should be always on"),
    it has been basically impossible to build a kernel with CONFIG_HOTPLUG
    turned off. Remove all the remaining references to it.

    Cc: Russell King
    Cc: Doug Thompson
    Cc: Bjorn Helgaas
    Cc: Steven Whitehouse
    Cc: Arnd Bergmann
    Cc: Pavel Machek
    Cc: "Rafael J. Wysocki"
    Cc: Andrew Morton
    Signed-off-by: Stephen Rothwell
    Acked-by: Mauro Carvalho Chehab
    Acked-by: Hans Verkuil
    Signed-off-by: Greg Kroah-Hartman

    Stephen Rothwell
     

05 Apr, 2013

2 commits

  • The RPX board is not supported by the kernel because CONFIG_RPXCLASSIC and
    CONFIG_RPXLITE symbols and not defined anywhere. Clean-up the m8xx_pcmcia
    driver a little bit.

    Signed-off-by: Artem Bityutskiy
    Cc: linux-pcmcia@lists.infradead.org
    Cc: Geert Uytterhoeven
    Cc: linux-m68k@lists.linux-m68k.org
    Signed-off-by: David Woodhouse

    Artem Bityutskiy
     
  • The CONFIG_MBX symbol is not defined anywhere in the kernel tree, which means
    this platform is not supported by the Linux kernel and we can remove the
    corresponding code from the 'm8xx_pcmcia' driver.

    Signed-off-by: Artem Bityutskiy
    Cc: linux-pcmcia@lists.infradead.org
    Cc: Geert Uytterhoeven
    Cc: linux-m68k@lists.linux-m68k.org
    Signed-off-by: David Woodhouse

    Artem Bityutskiy
     

22 Feb, 2013

4 commits

  • Pull trivial tree from Jiri Kosina:
    "Assorted tiny fixes queued in trivial tree"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits)
    DocBook: update EXPORT_SYMBOL entry to point at export.h
    Documentation: update top level 00-INDEX file with new additions
    ARM: at91/ide: remove unsused at91-ide Kconfig entry
    percpu_counter.h: comment code for better readability
    x86, efi: fix comment typo in head_32.S
    IB: cxgb3: delay freeing mem untill entirely done with it
    net: mvneta: remove unneeded version.h include
    time: x86: report_lost_ticks doesn't exist any more
    pcmcia: avoid static analysis complaint about use-after-free
    fs/jfs: Fix typo in comment : 'how may' -> 'how many'
    of: add missing documentation for of_platform_populate()
    btrfs: remove unnecessary cur_trans set before goto loop in join_transaction
    sound: soc: Fix typo in sound/codecs
    treewide: Fix typo in various drivers
    btrfs: fix comment typos
    Update ibmvscsi module name in Kconfig.
    powerpc: fix typo (utilties -> utilities)
    of: fix spelling mistake in comment
    h8300: Fix home page URL in h8300/README
    xtensa: Fix home page URL in Kconfig
    ...

    Linus Torvalds
     
  • Merge misc patches from Andrew Morton:

    - Florian has vanished so I appear to have become fbdev maintainer
    again :(

    - Joel and Mark are distracted to welcome to the new OCFS2 maintainer

    - The backlight queue

    - Small core kernel changes

    - lib/ updates

    - The rtc queue

    - Various random bits

    * akpm: (164 commits)
    rtc: rtc-davinci: use devm_*() functions
    rtc: rtc-max8997: use devm_request_threaded_irq()
    rtc: rtc-max8907: use devm_request_threaded_irq()
    rtc: rtc-da9052: use devm_request_threaded_irq()
    rtc: rtc-wm831x: use devm_request_threaded_irq()
    rtc: rtc-tps80031: use devm_request_threaded_irq()
    rtc: rtc-lp8788: use devm_request_threaded_irq()
    rtc: rtc-coh901331: use devm_clk_get()
    rtc: rtc-vt8500: use devm_*() functions
    rtc: rtc-tps6586x: use devm_request_threaded_irq()
    rtc: rtc-imxdi: use devm_clk_get()
    rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug()
    rtc: rtc-pcf8583: use dev_warn() instead of printk()
    rtc: rtc-sun4v: use pr_warn() instead of printk()
    rtc: rtc-vr41xx: use dev_info() instead of printk()
    rtc: rtc-rs5c313: use pr_err() instead of printk()
    rtc: rtc-at91rm9200: use dev_dbg()/dev_err() instead of printk()/pr_debug()
    rtc: rtc-rs5c372: use dev_dbg()/dev_warn() instead of printk()/pr_debug()
    rtc: rtc-ds2404: use dev_err() instead of printk()
    rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk()
    ...

    Linus Torvalds
     
  • Move the device rebind procedures for cardbus devices from the pm.resume
    into the pm.complete callback.

    The reason for moving the code is: "[...] The PM code needs to send
    suspend and resume messages to every device in the right order, and it
    can't do that if new devices are being added at the same time. [...]"

    However the situation really isn't quite that rigid. In particular,
    adding new children during a resume callback shouldn't cause much of
    problem because the children don't need to be resumed anyway (since they
    were never suspended). On the other hand, if you do it you will get a
    dev_warn() from the PM core, something like 'parent should not be
    sleeping'.

    Still, it is considered bad form and should be avoided if possible."

    (Alan Stern's full comment about the topic can
    be found here: )

    Signed-off-by: Christian Lamparter
    Cc: Dominik Brodowski
    Cc: Alan Stern
    Cc: Greg KH
    Acked-by: "Rafael J. Wysocki"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christian Lamparter
     
  • Pull char/misc driver patches from Greg Kroah-Hartman:
    "Here's the big char/misc driver patches for 3.9-rc1.

    Nothing major here, just lots of different driver updates (mei,
    hyperv, ipack, extcon, vmci, etc.).

    All of these have been in the linux-next tree for a while."

    * tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (209 commits)
    w1: w1_therm: Add force-pullup option for "broken" sensors
    w1: ds2482: Added 1-Wire pull-up support to the driver
    vme: add missing put_device() after device_register() fails
    extcon: max8997: Use workqueue to check cable state after completing boot of platform
    extcon: max8997: Set default UART/USB path on probe
    extcon: max8997: Consolidate duplicate code for checking ADC/CHG cable type
    extcon: max8997: Set default of ADC debounce time during initialization
    extcon: max8997: Remove duplicate code related to set H/W line path
    extcon: max8997: Move defined constant to header file
    extcon: max77693: Make max77693_extcon_cable static
    extcon: max8997: Remove unreachable code
    extcon: max8997: Make max8997_extcon_cable static
    extcon: max77693: Remove unnecessary goto statement to improve readability
    extcon: max77693: Convert to devm_input_allocate_device()
    extcon: gpio: Rename filename of extcon-gpio.c according to kernel naming style
    CREDITS: update email and address of Harald Hoyer
    extcon: arizona: Use MICDET for final microphone identification
    extcon: arizona: Always take the first HPDET reading as the final one
    extcon: arizona: Clear _trig_sts bits after jack detection
    extcon: arizona: Don't HPDET magic when headphones are enabled
    ...

    Linus Torvalds
     

29 Jan, 2013

1 commit


21 Jan, 2013

1 commit

  • Coverity complains about a use after free for 'res1' and 'res2' since
    we use the value of the pointers in a 'dev_dbg()' after they have been
    freed. That's not really a problem, but it still seems cleaner to
    defer freeing until we are completely done with the pointers.

    Signed-off-by: Jesper Juhl
    Signed-off-by: Jiri Kosina

    Jesper Juhl
     

18 Jan, 2013

2 commits

  • It doesn't seem this spinlock was properly initialized. This bug was
    introduced by commit 7a410e8d4d97457c8c381e2de9cdc7bd3306badc.

    Signed-off-by: Jean Delvare
    Cc: stable
    Signed-off-by: Greg Kroah-Hartman

    Jean Delvare
     
  • Smatch complains because the call to
    pci_set_drvdata(dev, &sockets[i].socket);
    is reading one step beyond the end of the sockets[] array. It will
    crash when we use it later.

    The only place which uses pci_get_drvdata() is i82092aa_pci_remove().
    That function should loop through all the sockets and unregister them.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Greg Kroah-Hartman

    Dan Carpenter
     

12 Jan, 2013

1 commit

  • The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
    while now and is almost always enabled by default. As agreed during the
    Linux kernel summit, remove it from any "depends on" lines in Kconfigs.

    CC: Russell King
    CC: Manuel Lauss
    CC: Dominik Brodowski
    CC: Ralf Baechle
    Signed-off-by: Kees Cook
    Acked-by: Haojian Zhuang

    Kees Cook
     

13 Dec, 2012

1 commit

  • Pull ARM SoC Header cleanups from Olof Johansson:
    "This is a collection of header file cleanups, mostly for OMAP and
    AT91, that keeps moving the platforms in the direction of
    multiplatform by removing the need for mach-dependent header files
    used in drivers and other places."

    Fix up mostly trivial conflicts as per Olof.

    * tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (106 commits)
    ARM: OMAP2+: Move iommu/iovmm headers to platform_data
    ARM: OMAP2+: Make some definitions local
    ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c
    ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
    ARM: OMAP2+: Move iopgtable header to drivers/iommu/
    ARM: OMAP: Merge iommu2.h into iommu.h
    atmel: move ATMEL_MAX_UART to platform_data/atmel.h
    ARM: OMAP: Remove omap_init_consistent_dma_size()
    arm: at91: move at91rm9200 rtc header in drivers/rtc
    arm: at91: move reset controller header to arm/arm/mach-at91
    arm: at91: move pit define to the driver
    arm: at91: move at91_shdwc.h to arch/arm/mach-at91
    arm: at91: move board header to arch/arm/mach-at91
    arn: at91: move at91_tc.h to arch/arm/mach-at91
    arm: at91 move at91_aic.h to arch/arm/mach-at91
    arm: at91 move board.h to arch/arm/mach-at91
    arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
    arm: at91: drop machine defconfig
    ARM: OMAP: Remove NEED_MACH_GPIO_H
    ARM: OMAP: Remove unnecessary mach and plat includes
    ...

    Linus Torvalds
     

29 Nov, 2012

5 commits


13 Nov, 2012

1 commit

  • From Jean-Christophe PLAGNIOL-VILLARD :
    arm: at91: mach header cleanup

    This first patch serie start the cleanup of the header in mach
    by moving all the platform data to include/linux/platform_data

    and move the board header and drivers header next to them

    * tag 'for-3.8-at91_header_clean' of git://github.com/at91linux/linux-at91:
    arm: at91: move at91rm9200 rtc header in drivers/rtc
    arm: at91: move reset controller header to arm/arm/mach-at91
    arm: at91: move pit define to the driver
    arm: at91: move at91_shdwc.h to arch/arm/mach-at91
    arm: at91: move board header to arch/arm/mach-at91
    arn: at91: move at91_tc.h to arch/arm/mach-at91
    arm: at91 move at91_aic.h to arch/arm/mach-at91
    arm: at91 move board.h to arch/arm/mach-at91
    arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
    arm: at91: drop machine defconfig

    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
    Cc: Nicolas Ferre
    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

06 Nov, 2012

2 commits

  • Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
    Cc: Nicolas Ferre

    Jean-Christophe PLAGNIOL-VILLARD
     
  • Merging in Greg's tty tree including a cleanup patch needed by the OMAP serial
    header cleanups.

    * depends/tty: (305 commits)
    tty/serial/8250: Make omap hardware workarounds local to 8250.h
    serial/8250/8250_early: Prevent rounding error in uartclk
    serial: samsung: use clk_prepare_enable and clk_disable_unprepare
    TTY: Report warning when low_latency flag is wrongly used
    console: use might_sleep in console_lock
    TTY: move tty buffers to tty_port
    TTY: add port -> tty link
    TTY: tty_buffer, cache pointer to tty->buf
    TTY: move TTY_FLUSH* flags to tty_port
    TTY: n_tty, propagate n_tty_data
    TTY: move ldisc data from tty_struct: locks
    TTY: move ldisc data from tty_struct: read_* and echo_* and canon_* stuff
    TTY: move ldisc data from tty_struct: bitmaps
    TTY: move ldisc data from tty_struct: simple members
    TTY: n_tty, add ldisc data to n_tty
    TTY: audit, stop accessing tty->icount
    TTY: n_tty, remove bogus checks
    TTY: n_tty, simplify read_buf+echo_buf allocation
    TTY: hci_ldisc, remove invalid check in open
    TTY: ldisc, wait for idle ldisc in release
    ...

    Olof Johansson
     

20 Oct, 2012

1 commit

  • …nel/git/arm/arm-soc into fixes

    A collection of warning fixes on non-ARM code from Arnd Bergmann:

    * 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: s3c: mark s3c2440_clk_add as __init_refok
    spi/s3c64xx: use correct dma_transfer_direction type
    pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
    USB: EHCI: mark ehci_orion_conf_mbus_windows __devinit
    mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN
    SCSI: ARM: make fas216_dumpinfo function conditional
    SCSI: ARM: ncr5380/oak uses no interrupts

    Olof Johansson
     

18 Oct, 2012

1 commit


12 Oct, 2012

1 commit

  • The sharpsl_pcmcia_ops structure gets passed into
    sa11xx_drv_pcmcia_probe, where it gets accessed at run-time,
    unlike all other pcmcia drivers that pass their structures
    into platform_device_add_data, which makes a copy.

    This means the gcc warning is valid and the structure
    must not be marked as __initdata.

    Without this patch, building collie_defconfig results in:

    drivers/pcmcia/pxa2xx_sharpsl.c:22:31: fatal error: mach-pxa/hardware.h: No such file or directory
    compilation terminated.
    make[3]: *** [drivers/pcmcia/pxa2xx_sharpsl.o] Error 1
    make[2]: *** [drivers/pcmcia] Error 2
    make[1]: *** [drivers] Error 2
    make: *** [sub-make] Error 2

    Signed-off-by: Arnd Bergmann
    Cc: Dominik Brodowski
    Cc: Russell King
    Cc: Pavel Machek
    Cc: linux-pcmcia@lists.infradead.org
    Cc: Jochen Friedrich
    Cc: stable@vger.kernel.org

    Arnd Bergmann
     

02 Oct, 2012

3 commits

  • Pull ARM soc multiplatform enablement from Olof Johansson:
    "This is a pretty significant branch. It's the introduction of the
    first multiplatform support on ARM, and with this (and the later
    branch) merged, it is now possible to build one kernel that contains
    support for highbank, vexpress, mvebu, socfpga, and picoxcell. More
    platforms will be convered over in the next few releases.

    Two critical last things had to be done for this to be practical and
    possible:
    * Today each platform has its own include directory under
    mach-/include/mach/*, and traditionally that is where a lot
    of driver/platform shared definitions have gone, such as platform
    data structures. They now need to move out to a common location
    instead, and this branch moves a large number of those out to
    include/linux/platform_data.
    * Each platform used to list the device trees to compile for its
    boards in mach-/Makefile.boot.

    Both of the above changes will mean that there are some merge
    conflicts to come (and some to resolve here). It's a one-time move
    and once it settles in, we should be good for quite a while. Sorry
    for the overhead."

    Fix conflicts as per Olof.

    * tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)
    ARM: add v7 multi-platform defconfig
    ARM: msm: Move core.h contents into common.h
    ARM: highbank: call highbank_pm_init from .init_machine
    ARM: dtb: move all dtb targets to common Makefile
    ARM: spear: move platform_data definitions
    ARM: samsung: move platform_data definitions
    ARM: orion: move platform_data definitions
    ARM: vexpress: convert to multi-platform
    ARM: initial multiplatform support
    ARM: mvebu: move armada-370-xp.h in mach dir
    ARM: vexpress: remove dependency on mach/* headers
    ARM: picoxcell: remove dependency on mach/* headers
    ARM: move all dtb targets out of Makefile.boot
    ARM: picoxcell: move debug macros to include/debug
    ARM: socfpga: move debug macros to include/debug
    ARM: mvebu: move debug macros to include/debug
    ARM: vexpress: move debug macros to include/debug
    ARM: highbank: move debug macros to include/debug
    ARM: move debug macros to common location
    ARM: make mach/gpio.h headers optional
    ...

    Linus Torvalds
     
  • Pull ARM soc general cleanups from Olof Johansson:
    "This is a large branch that contains a handful of different cleanups:

    - Fixing up the I/O space remapping on PCI on ARM. This is a series
    from Rob Herring that restructures how all pci devices allocate I/O
    space, and it's part of the work to allow multiplatform kernels.
    - A number of cleanup series for OMAP, moving and removing some
    headers, sparse irq rework and in general preparation for
    multiplatform.
    - Final removal of all non-DT boards for Tegra, it is now
    device-tree-only!
    - Removal of a stale platform, nxp4008. It's an old mobile chipset
    that is no longer in use, and was very likely never really used
    with a mainline kernel. We have not been able to find anyone
    interested in keeping it around in the kernel.
    - Removal of the legacy dmaengine driver on tegra

    + A handful of other things that I haven't described above."

    Fix up some conflicts with the staging tree (and because nxp4008 was
    removed)

    * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (184 commits)
    ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
    ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
    ARM: mmp: using for_each_set_bit to simplify the code
    ARM: tegra: harmony: fix ldo7 regulator-name
    ARM: OMAP2+: Make omap4-keypad.h local
    ARM: OMAP2+: Make l4_3xxx.h local
    ARM: OMAP2+: Make l4_2xxx.h local
    ARM: OMAP2+: Make l3_3xxx.h local
    ARM: OMAP2+: Make l3_2xxx.h local
    ARM: OMAP1: Move irda.h from plat to mach
    ARM: OMAP2+: Make hdq1w.h local
    ARM: OMAP2+: Make gpmc-smsc911x.h local
    ARM: OMAP2+: Make gpmc-smc91x.h local
    ARM: OMAP1: Move flash.h from plat to mach
    ARM: OMAP2+: Make debug-devices.h local
    ARM: OMAP1: Move board-voiceblue.h from plat to mach
    ARM: OMAP1: Move board-sx1.h from plat to mach
    ARM: OMAP2+: Make omap-wakeupgen.h local
    ARM: OMAP2+: Make omap-secure.h local
    ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
    ...

    Linus Torvalds
     
  • Pull non-critical ARM soc bug fixes from Olof Johansson:
    "These were submitted as bug fixes before v3.6 but not considered
    important enough to be included in it. Some of them cross over to
    cleanup territory as well, and aren't strictly bugfixes."

    * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
    ARM: nomadik: remove NAND_NO_READRDY use
    ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()
    ARM: SAMSUNG: Add missing variable declaration in s3c64xx_spi1_set_platdata()
    ARM: S3C24XX: removes unnecessary semicolon
    ARM: S3C24xx: delete double assignment
    ARM: EXYNOS: fix address for EXYNOS4 MDMA1
    ARM: EXYNOS: fixed SYSMMU setup definition to mate parameter name
    ARM: ep93xx: Move ts72xx.h out of include/mach
    ARM: ep93xx: use __iomem pointers for MMIO
    ARM: msm: Fix early debug uart mapping on some memory configs
    ARM: msm: io: Change the default static iomappings to be shared
    ARM: msm: io: Remove 7x30 iomap region from 7x00
    ARM: msm: Remove call to missing FPGA init on 8660
    ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write
    ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register save
    dma: tegra: make data used as *of_device_id.data const
    can: mpc5xxx_can: make data used as *of_device_id.data const
    macintosh/mediabay: make data used as *of_device_id.data const
    i2c/mpc: make data used as *of_device_id.data const
    mfd/da9052: make i2c_device_id array const
    ...

    Linus Torvalds
     

22 Sep, 2012

1 commit

  • * multiplatform/platform-data:
    ARM: spear: move platform_data definitions
    ARM: samsung: move platform_data definitions
    ARM: orion: move platform_data definitions
    ARM: nomadik: move platform_data definitions
    ARM: w90x900: move platform_data definitions
    ARM: vt8500: move platform_data definitions
    ARM: tegra: move sdhci platform_data definition
    ARM: sa1100: move platform_data definitions
    ARM: pxa: move platform_data definitions
    ARM: netx: move platform_data definitions
    ARM: msm: move platform_data definitions
    ARM: imx: move platform_data definitions
    ARM: ep93xx: move platform_data definitions
    ARM: davinci: move platform_data definitions
    ARM: at91: move platform_data definitions

    Conflicts due to removed files:
    arch/arm/mach-tegra/board-harmony.c
    arch/arm/mach-tegra/board-trimslice.c

    Conflicts due to code removal:
    arch/arm/mach-tegra/board-paz00.c

    Context conflicts in:
    drivers/mmc/host/sdhci-tegra.c
    drivers/net/irda/pxaficp_ir.c

    Signed-off-by: Olof Johansson

    Olof Johansson
     

21 Sep, 2012

1 commit

  • In case of error, the function clk_get() returns ERR_PTR()
    and never returns NULL pointer. The NULL test in the error
    handling should be replaced with IS_ERR().

    dpatch engine is used to auto generated this patch.
    (https://github.com/weiyj/dpatch)

    Signed-off-by: Wei Yongjun
    Acked-by: Eric Miao
    Signed-off-by: Haojian Zhuang

    Wei Yongjun