8 years agoASoC: sst_platform: free the resources on fail path
Lu Guanqun [Wed, 6 Apr 2011 02:20:32 +0000]
ASoC: sst_platform: free the resources on fail path

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: sst_platform: initialize module_name properly
Lu Guanqun [Wed, 6 Apr 2011 02:20:26 +0000]
ASoC: sst_platform: initialize module_name properly

module_name will be checked in register_sst_card.
It will fail to register sst card if it's not initialized.

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Add max98095 CODEC driver
Peter Hsiang [Tue, 5 Apr 2011 02:35:30 +0000]
ASoC: Add max98095 CODEC driver

This patch adds the MAX98095 CODEC driver.

Signed-off-by: Peter Hsiang <peter.hsiang@maxim-ic.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoMerge branch 'for-2.6.39' into for-2.6.40
Mark Brown [Wed, 6 Apr 2011 14:15:15 +0000]
Merge branch 'for-2.6.39' into for-2.6.40

8 years agoASoC: Tegra: Suspend/resume support
Stephen Warren [Wed, 6 Apr 2011 01:35:30 +0000]
ASoC: Tegra: Suspend/resume support

ASoC machine drivers that are their own platform_driver (as opposed to
those using the soc-audio platform_driver) need to explicitly set up
power-management operation callbacks.

To avoid cut/paste, snd_soc_pm_ops also needs to be exported.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoMerge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Takashi Iwai [Tue, 5 Apr 2011 07:12:41 +0000]
Merge branch 'for-2.6.40' of git://git./linux/kernel/git/broonie/sound-2.6 into topic/asoc

8 years agoASoC: Add bias level data to DAPM context debugfs
Mark Brown [Mon, 4 Apr 2011 11:48:13 +0000]
ASoC: Add bias level data to DAPM context debugfs

This is also in the old sysfs diagnostics but it's nice to have everything
in one place.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Fix comment width in soc-cache.c
Mark Brown [Mon, 4 Apr 2011 08:55:42 +0000]
ASoC: Fix comment width in soc-cache.c

Lines should be less than 80 columns.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Remove excessively verbose logging on I2C write
Mark Brown [Mon, 4 Apr 2011 05:55:59 +0000]
ASoC: Remove excessively verbose logging on I2C write

We don't need to log every I2C transfer, and certainly not at error level.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Fix to avoid compile error
Seungwhan Youn [Mon, 4 Apr 2011 04:43:42 +0000]
ASoC: Fix to avoid compile error

This patch fixes to avoid compile error when ASoC codec doesn't use I2C
nor SPI on snd_soc_hw_bulk_write_raw().

Signed-off-by: Seungwhan Youn <sw.youn@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoMerge branch 'for-2.6.39' into for-2.6.40
Mark Brown [Sun, 3 Apr 2011 13:12:15 +0000]
Merge branch 'for-2.6.39' into for-2.6.40

8 years agoASoC: format_register_str: Don't clip register values
Stephen Warren [Fri, 1 Apr 2011 20:50:44 +0000]
ASoC: format_register_str: Don't clip register values

wordsize is used as the textual width of a register address.

regsize is used as the textual width of a register value.

The assignments to these values were swapped. In the case of WM8903, which
has 8-bit register addresses and 16-bit register values, this caused the
register values to be clipped to 2 digits instead of the full 4.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Properly handle spitz MIC GPIO
Marek Vasut [Sat, 2 Apr 2011 01:43:15 +0000]
ASoC: Properly handle spitz MIC GPIO

This patch firstly restructurizes the code a bit by getting rid of continuous
checking for machine type in spitz_mic_bias().

Then the patch properly requests the MIC GPIO in the spitz_init() and frees it
in spitz_exit().

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Name jack GPIOs based on jack not codec
Stephen Warren [Fri, 1 Apr 2011 20:50:43 +0000]
ASoC: Name jack GPIOs based on jack not codec

snd_soc_jack_gpio has a name field. Use that name when registering the IRQ,
since this is far more informative than the codec driver name. This shows
up in /proc/interrupts.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoMerge branch 'for-2.6.39' into for-2.6.40
Mark Brown [Sun, 3 Apr 2011 10:29:43 +0000]
Merge branch 'for-2.6.39' into for-2.6.40

8 years agoMerge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Mark Brown [Sun, 3 Apr 2011 10:28:29 +0000]
Merge branch 'for-2.6.39' of git://git./linux/kernel/git/broonie/sound-2.6 into for-2.6.39

8 years agoASoC: PXA: Fix oops in __pxa2xx_pcm_prepare
Vasily Khoruzhick [Sat, 2 Apr 2011 07:54:47 +0000]
ASoC: PXA: Fix oops in __pxa2xx_pcm_prepare

pxa2xx_pcm_hw_free frees dma channel and sets prtd->dma_ch to -1,
but does not set prtd->params to NULL, so if pxa2xx_pcm_hw_params will
be called immediately, it leaves prtd->dma_ch initialized with -1,
and it results in oops in __pxa2xx_pcm_prepare. This bug is triggered
via SDL.

This patch adds check for prtd->dma_ch to __pxa2xx_pcm_prepare and
cleans prtd->params, so now it works properly.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Use data based init for sn95031 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:17 +0000]
ASoC: Use data based init for sn95031 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Use data based init for ak4535 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:07 +0000]
ASoC: Use data based init for ak4535 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Use data based init for tlv320aic23 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:16 +0000]
ASoC: Use data based init for tlv320aic23 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Use data based init for wm8711 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:15 +0000]
ASoC: Use data based init for wm8711 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Use data based init for wm8728 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:14 +0000]
ASoC: Use data based init for wm8728 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Use data based init for wm9705 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:13 +0000]
ASoC: Use data based init for wm9705 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Use data based init for wm9712 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:12 +0000]
ASoC: Use data based init for wm9712 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Use data based init for wm9713 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:11 +0000]
ASoC: Use data based init for wm9713 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Use data based init for max98088 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:10 +0000]
ASoC: Use data based init for max98088 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Use data based init for cx20442 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:09 +0000]
ASoC: Use data based init for cx20442 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Use data based init for ak4671 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:08 +0000]
ASoC: Use data based init for ak4671 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: soc-cache: Warn on syncing any non-writable registers
Dimitris Papastamos [Mon, 28 Mar 2011 10:39:15 +0000]
ASoC: soc-cache: Warn on syncing any non-writable registers

When syncing the cache, if the driver has given us a writable_register()
callback, use it to check if we are syncing a non-writable register
and if so warn the user.

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: soc-cache: Fix indentation issues
Dimitris Papastamos [Mon, 28 Mar 2011 10:39:14 +0000]
ASoC: soc-cache: Fix indentation issues

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: zylonite: set .codec_dai_name in initializer
Antonio Ospite [Fri, 18 Mar 2011 11:47:33 +0000]
ASoC: zylonite: set .codec_dai_name in initializer

Fix the initialization of .codec_dai_name in zylonite_dai initializer,
do not mix it with the initialization of .codec_name which is set
already a few lines above.

Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Blackfin: push down SPORT settings from global variables
Barry Song [Mon, 28 Mar 2011 05:45:10 +0000]
ASoC: Blackfin: push down SPORT settings from global variables

Now that we have multi-component support, take the time to unify the
SPORT implementations a bit and make the setup dynamic.  This kills
off the global sport_handle which was shared across all the Blackfin
machine drivers.  The pin management aspect is off loaded to platform
resources, and now multiple SPORTs can be instantiated simultaneously.

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Scott Jiang <scott.jiang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Blackfin: standardize machine driver names
Mike Frysinger [Mon, 28 Mar 2011 05:45:09 +0000]
ASoC: Blackfin: standardize machine driver names

Some machine drivers were using "bf5xx-", others were using "bf5xx_",
while others were using "bfin-".  Further, some were using the same
name in the transport layer which makes it hard to use different codecs
at the same time.  So standardize all of them to "bfin-" and make sure
they are name spaced according to their driver name.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Blackfin: drop "-codec" from codec names
Mike Frysinger [Mon, 28 Mar 2011 05:45:08 +0000]
ASoC: Blackfin: drop "-codec" from codec names

The recent multi-component patch incorrectly added "-codec" suffixes to
parts which are not MFD.  Drop the suffix from the machine drivers too.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Blackfin: add ad193x sysclk configuration
Scott Jiang [Sun, 27 Mar 2011 09:33:04 +0000]
ASoC: Blackfin: add ad193x sysclk configuration

Signed-off-by: Scott Jiang <scott.jiang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: SSM2602: convert to soc-cache
Cliff Cai [Sun, 27 Mar 2011 21:22:57 +0000]
ASoC: SSM2602: convert to soc-cache

Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: ad1980: fix codec name
Mike Frysinger [Sun, 27 Mar 2011 04:44:13 +0000]
ASoC: ad1980: fix codec name

The codec name should not have a "-codec" suffix since this is not part of
a MFD.  This was incorrectly changed during the multi-component updated.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: ad193x: fix codec name
Mike Frysinger [Sun, 27 Mar 2011 04:44:12 +0000]
ASoC: ad193x: fix codec name

The codec name should not have a "-codec" suffix since this is not part of
a MFD.  This was incorrectly changed during the multi-component updated.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: ad73311: fix codec name
Mike Frysinger [Sun, 27 Mar 2011 04:44:11 +0000]
ASoC: ad73311: fix codec name

The codec name should not have a "-codec" suffix since this is not part of
a MFD.  This was incorrectly changed during the multi-component updated.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: SSM2602: fix codec name
Mike Frysinger [Sun, 27 Mar 2011 04:44:10 +0000]
ASoC: SSM2602: fix codec name

The codec name should not have a "-codec" suffix since this is not part of
a MFD.  This was incorrectly changed during the multi-component updated.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: fix sorting order of codecs in kconfig
Mike Frysinger [Sun, 27 Mar 2011 04:43:59 +0000]
ASoC: fix sorting order of codecs in kconfig

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Remove -codec from WM8731 driver name
Mark Brown [Sun, 27 Mar 2011 13:35:15 +0000]
ASoC: Remove -codec from WM8731 driver name

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Convert WM8731 to table based DAPM setup
Mark Brown [Sun, 27 Mar 2011 13:33:03 +0000]
ASoC: Convert WM8731 to table based DAPM setup

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Convert WM8903 to table based DAPM setup
Mark Brown [Sun, 27 Mar 2011 12:43:45 +0000]
ASoC: Convert WM8903 to table based DAPM setup

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoMerge branch 'for-2.6.39' into for-2.6.40
Mark Brown [Tue, 29 Mar 2011 22:14:04 +0000]
Merge branch 'for-2.6.39' into for-2.6.40

8 years agoASoC: Fix CODEC device name for Corgi
Mark Brown [Sun, 27 Mar 2011 13:40:01 +0000]
ASoC: Fix CODEC device name for Corgi

Got typoed in the multi-component changes.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Cc: stable@kernel.org

8 years agoLinux 2.6.39-rc1
Linus Torvalds [Tue, 29 Mar 2011 19:09:47 +0000]
Linux 2.6.39-rc1

8 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
Linus Torvalds [Tue, 29 Mar 2011 19:09:30 +0000]
Merge branch 'for-linus' of git://git./linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (26 commits)
  mmc: SDHI should depend on SUPERH || ARCH_SHMOBILE
  mmc: tmio_mmc: Move some defines into a shared header
  mmc: tmio: support aggressive clock gating
  mmc: tmio: fix power-mode interpretation
  mmc: tmio: remove work-around for unmasked SDIO interrupts
  sh: fix SDHI IO address-range
  ARM: mach-shmobile: fix SDHI IO address-range
  mmc: tmio: only access registers above 0xff, if available
  mfd: remove now redundant sh_mobile_sdhi.h header
  sh: convert boards to use linux/mmc/sh_mobile_sdhi.h
  ARM: mach-shmobile: convert boards to use linux/mmc/sh_mobile_sdhi.h
  mmc: tmio: convert the SDHI MMC driver from MFD to a platform driver
  sh: ecovec: use the CONFIG_MMC_TMIO symbols instead of MFD
  mmc: tmio: split core functionality, DMA and MFD glue
  mmc: tmio: use PIO for short transfers
  mmc: tmio-mmc: Improve DMA stability on sh-mobile
  mmc: fix mmc_app_send_scr() for dma transfer
  mmc: sdhci-esdhc: enable esdhc on imx53
  mmc: sdhci-esdhc: use writel/readl as general APIs
  mmc: sdhci: add the abort CMDTYPE bits definition
  ...

8 years agoMerge branch 'frv' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux...
Linus Torvalds [Tue, 29 Mar 2011 18:43:30 +0000]
Merge branch 'frv' of git://git./linux/kernel/git/dhowells/linux-2.6-frv

* 'frv' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv:
  FRV: Use generic show_interrupts()
  FRV: Convert genirq namespace
  frv: Select GENERIC_HARDIRQS_NO_DEPRECATED
  frv: Convert cpu irq_chip to new functions
  frv: Convert mb93493 irq_chip to new functions
  frv: Convert mb93093 irq_chip to new function
  frv: Convert mb93091 irq_chip to new functions
  frv: Fix typo from __do_IRQ overhaul
  frv: Remove stale irq_chip.end
  FRV: Do some cleanups
  FRV: Missing node arg in alloc_thread_info_node() macro
  NOMMU: implement access_remote_vm
  NOMMU: support SMP dynamic percpu_alloc
  NOMMU: percpu should use is_vmalloc_addr().

8 years agoMerge branch 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Tue, 29 Mar 2011 18:36:52 +0000]
Merge branch 'stable/bug-fixes-rc1' of git://git./linux/kernel/git/konrad/xen

* 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: Use new irq_move functions
  xen: Convert genirq namespace
  xen: fix p2m section mismatches
  xen/p2m: Allocate p2m tracking pages on override
  xen-gntdev: unlock on error path in gntdev_mmap()
  xen-gntdev: return -EFAULT on copy_to_user failure

8 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
Linus Torvalds [Tue, 29 Mar 2011 18:20:09 +0000]
Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: softdog.c: enhancement to optionally invoke panic instead of reboot on timer expiry
  watchdog: fix nv_tco section mismatch
  watchdog: sp5100_tco.c: Check if firmware has set correct value in tcobase.
  watchdog: Convert release_resource to release_region/release_mem_region
  watchdog: s3c2410_wdt.c: Convert release_resource to release_region/release_mem_region

8 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Linus Torvalds [Tue, 29 Mar 2011 18:11:18 +0000]
Merge branch 'for-linus' of git://git./linux/kernel/git/bp/bp

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: Fix potential memleak

8 years agoMerge branch 'irq-final-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Tue, 29 Mar 2011 17:46:15 +0000]
Merge branch 'irq-final-for-linus-v2' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'irq-final-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (111 commits)
  gpio: ab8500: Mark broken
  genirq: Remove move_*irq leftovers
  genirq: Remove compat code
  drivers: Final irq namespace conversion
  mn10300: Use generic show_interrupts()
  mn10300: Cleanup irq_desc access
  mn10300: Convert genirq namespace
  frv: Use generic show_interrupts()
  frv: Convert genirq namespace
  frv: Select GENERIC_HARDIRQS_NO_DEPRECATED
  frv: Convert cpu irq_chip to new functions
  frv: Convert mb93493 irq_chip to new functions
  frv: Convert mb93093 irq_chip to new function
  frv: Convert mb93091 irq_chip to new functions
  frv: Fix typo from __do_IRQ overhaul
  frv: Remove stale irq_chip.end
  m68k: Convert irq function namespace
  xen: Use new irq_move functions
  xen: Cleanup genirq namespace
  unicore32: Use generic show_interrupts()
  ...

8 years agochar/tpm: Fix unitialized usage of data buffer
Peter Huewe [Tue, 29 Mar 2011 11:31:25 +0000]
char/tpm: Fix unitialized usage of data buffer

This patch fixes information leakage to the userspace by initializing
the data buffer to zero.

Reported-by: Peter Huewe <huewe.external@infineon.com>
Signed-off-by: Peter Huewe <huewe.external@infineon.com>
Signed-off-by: Marcel Selhorst <m.selhorst@sirrix.com>
[ Also removed the silly "* sizeof(u8)".  If that isn't 1, we have way
  deeper problems than a simple multiplication can fix.   - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

8 years agoamd64_edac: Fix potential memleak
Borislav Petkov [Tue, 29 Mar 2011 16:10:53 +0000]
amd64_edac: Fix potential memleak

We check the pointers together but at least one of them could be invalid
due to failed allocation. Since we cannot continue if either of the two
allocations has failed, exit early by freeing them both.

Cc: <stable@kernel.org> # 38.x
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>

8 years agofs: don't use igrab() while holding i_lock
Dave Chinner [Tue, 29 Mar 2011 07:08:50 +0000]
fs: don't use igrab() while holding i_lock

Fix the incorrect use of igrab() inside the i_lock in NFS and Ceph‥

If we are already holding the i_lock, we have a reference to the
inode so we can safely use ihold() to gain an extra reference. This
avoids hangs due to lock recursion on the i_lock now that the
inode_lock is gone and igrab() uses the i_lock itself.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Cc: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

8 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 29 Mar 2011 14:41:33 +0000]
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
  xfrm: Restrict extended sequence numbers to esp
  xfrm: Check for esn buffer len in xfrm_new_ae
  xfrm: Assign esn pointers when cloning a state
  xfrm: Move the test on replay window size into the replay check functions
  netdev: bfin_mac: document TE setting in RMII modes
  drivers net: Fix declaration ordering in inline functions.
  cxgb3: Apply interrupt coalescing settings to all queues
  net: Always allocate at least 16 skb frags regardless of page size
  ipv4: Don't ip_rt_put() an error pointer in RAW sockets.
  net: fix ethtool->set_flags not intended -EINVAL return value
  mlx4_en: Fix loss of promiscuity
  tg3: Fix inline keyword usage
  tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h>
  net: use CHECKSUM_NONE instead of magic number
  Net / jme: Do not use legacy PCI power management
  myri10ge: small rx_done refactoring
  bridge: notify applications if address of bridge device changes
  ipv4: Fix IP timestamp option (IPOPT_TS_PRESPEC) handling in ip_options_echo()
  can: c_can: Fix tx_bytes accounting
  can: c_can_platform: fix irq check in probe
  ...

8 years agoxen: Use new irq_move functions
Thomas Gleixner [Thu, 24 Mar 2011 20:37:31 +0000]
xen: Use new irq_move functions

These functions take irq_data as an argument and avoid a redundant
lookup in the sparse irq case.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

8 years agoxen: Convert genirq namespace
Thomas Gleixner [Fri, 25 Mar 2011 10:01:39 +0000]
xen: Convert genirq namespace

Converted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

8 years agoxen: fix p2m section mismatches
Randy Dunlap [Thu, 24 Mar 2011 20:34:32 +0000]
xen: fix p2m section mismatches

Fix section mismatch warnings:
set_phys_range_identity() is called by __init xen_set_identity(),
so also mark set_phys_range_identity() as __init.
then:
__early_alloc_p2m() is called set_phys_range_identity(), so also mark
__early_alloc_p2m() as __init.

WARNING: arch/x86/built-in.o(.text+0x7856): Section mismatch in reference from the function __early_alloc_p2m() to the function .init.text:extend_brk()
The function __early_alloc_p2m() references
the function __init extend_brk().
This is often because __early_alloc_p2m lacks a __init
annotation or the annotation of extend_brk is wrong.

WARNING: arch/x86/built-in.o(.text+0x7967): Section mismatch in reference from the function set_phys_range_identity() to the function .init.text:extend_brk()
The function set_phys_range_identity() references
the function __init extend_brk().
This is often because set_phys_range_identity lacks a __init
annotation or the annotation of extend_brk is wrong.

[v2: Per Stephen Hemming recommonedation made __early_alloc_p2m static]
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

8 years agoFRV: Use generic show_interrupts()
Thomas Gleixner [Tue, 29 Mar 2011 13:05:13 +0000]
FRV: Use generic show_interrupts()

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>

8 years agoFRV: Convert genirq namespace
Thomas Gleixner [Tue, 29 Mar 2011 13:05:13 +0000]
FRV: Convert genirq namespace

Convert to new function names.  Converted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>

8 years agofrv: Select GENERIC_HARDIRQS_NO_DEPRECATED
Thomas Gleixner [Tue, 29 Mar 2011 13:05:13 +0000]
frv: Select GENERIC_HARDIRQS_NO_DEPRECATED

All chips converted

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>

8 years agofrv: Convert cpu irq_chip to new functions
Thomas Gleixner [Tue, 29 Mar 2011 13:05:13 +0000]
frv: Convert cpu irq_chip to new functions

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>

8 years agofrv: Convert mb93493 irq_chip to new functions
Thomas Gleixner [Tue, 29 Mar 2011 13:05:13 +0000]
frv: Convert mb93493 irq_chip to new functions

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>

8 years agofrv: Convert mb93093 irq_chip to new function
Thomas Gleixner [Tue, 29 Mar 2011 13:05:13 +0000]
frv: Convert mb93093 irq_chip to new function

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>

8 years agofrv: Convert mb93091 irq_chip to new functions
Thomas Gleixner [Tue, 29 Mar 2011 13:05:13 +0000]
frv: Convert mb93091 irq_chip to new functions

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>

8 years agofrv: Fix typo from __do_IRQ overhaul
Thomas Gleixner [Tue, 29 Mar 2011 13:05:13 +0000]
frv: Fix typo from __do_IRQ overhaul

Compiles way better.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>

8 years agofrv: Remove stale irq_chip.end
Thomas Gleixner [Tue, 29 Mar 2011 13:05:12 +0000]
frv: Remove stale irq_chip.end

irq_chip.end got obsolete with the removal of __do_IRQ().

irq-mb93093.c even lacks an implementation, but nobody noticed that
it's broken since commit 88d6e1 in 2006.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>

8 years agoFRV: Do some cleanups
Amerigo Wang [Tue, 29 Mar 2011 13:05:12 +0000]
FRV: Do some cleanups

1. frv doesn't support SMP, remove the useless SMP bits.

2. frv has its own alloc_task_struct, so define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
   (I am not sure if frv should use generic alloc_task_struct().)

Signed-off-by: WANG Cong <amwang@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>

8 years agoFRV: Missing node arg in alloc_thread_info_node() macro
David Howells [Tue, 29 Mar 2011 13:05:12 +0000]
FRV: Missing node arg in alloc_thread_info_node() macro

There are two alloc_thread_info_node() macros defined (one for debugging and
one for normal).  The commit that changed them most recently:

commit b6a84016bd2598e35ead635147fa53619982648d
Author: Eric Dumazet <eric.dumazet@gmail.com>
Date:   Tue Mar 22 16:30:42 2011 -0700
Subject: mm: NUMA aware alloc_thread_info_node()

didn't add the node argument into the macro argument list for the normal macro.
This results in the following error:

kernel/fork.c:267:39: error: macro "alloc_thread_info_node" passed 2 arguments, but takes just 1
kernel/fork.c: In function 'dup_task_struct':
kernel/fork.c:267: error: 'alloc_thread_info_node' undeclared (first use in this function)
kernel/fork.c:267: error: (Each undeclared identifier is reported only once
kernel/fork.c:267: error: for each function it appears in.)

Signed-off-by: David Howells <dhowells@redhat.com>

8 years agoNOMMU: implement access_remote_vm
Mike Frysinger [Tue, 29 Mar 2011 13:05:12 +0000]
NOMMU: implement access_remote_vm

Recent vm changes brought in a new function which the core procfs code
utilizes.  So implement it for nommu systems too to avoid link failures.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Simon Horman <horms@verge.net.au>
Tested-by: Ithamar Adema <ithamar.adema@team-embedded.nl>
Acked-by: Greg Ungerer <gerg@uclinux.org>

8 years agogpio: ab8500: Mark broken
Thomas Gleixner [Tue, 29 Mar 2011 02:02:50 +0000]
gpio: ab8500: Mark broken

This driver is broken in several aspects.

 1) old style irq_chip functions. Sigh

 2) Abuse of the unlock callback. That's not supposed to be a state
    machine for evrything and some more.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agogenirq: Remove move_*irq leftovers
Thomas Gleixner [Tue, 29 Mar 2011 00:51:13 +0000]
genirq: Remove move_*irq leftovers

All users converted to new interface.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agogenirq: Remove compat code
Thomas Gleixner [Mon, 28 Mar 2011 11:32:20 +0000]
genirq: Remove compat code

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agodrivers: Final irq namespace conversion
Thomas Gleixner [Mon, 28 Mar 2011 15:49:12 +0000]
drivers: Final irq namespace conversion

Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agomn10300: Use generic show_interrupts()
Thomas Gleixner [Thu, 24 Mar 2011 17:54:24 +0000]
mn10300: Use generic show_interrupts()

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agomn10300: Cleanup irq_desc access
Thomas Gleixner [Thu, 24 Mar 2011 16:36:37 +0000]
mn10300: Cleanup irq_desc access

The migration needs only access to irq_data.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agomn10300: Convert genirq namespace
Thomas Gleixner [Thu, 24 Mar 2011 16:35:56 +0000]
mn10300: Convert genirq namespace

Convert to new function names. Converted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agofrv: Use generic show_interrupts()
Thomas Gleixner [Thu, 24 Mar 2011 17:48:36 +0000]
frv: Use generic show_interrupts()

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agofrv: Convert genirq namespace
Thomas Gleixner [Thu, 24 Mar 2011 15:38:49 +0000]
frv: Convert genirq namespace

Convert to new function names. Converted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agofrv: Select GENERIC_HARDIRQS_NO_DEPRECATED
Thomas Gleixner [Sun, 6 Feb 2011 19:20:39 +0000]
frv: Select GENERIC_HARDIRQS_NO_DEPRECATED

All chips converted

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Howells <dhowells@redhat.com>
LKML-Reference: <20110206192106.601290592@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agofrv: Convert cpu irq_chip to new functions
Thomas Gleixner [Sun, 6 Feb 2011 19:20:38 +0000]
frv: Convert cpu irq_chip to new functions

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Howells <dhowells@redhat.com>
LKML-Reference: <20110206192106.501651128@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agofrv: Convert mb93493 irq_chip to new functions
Thomas Gleixner [Sun, 6 Feb 2011 19:20:37 +0000]
frv: Convert mb93493 irq_chip to new functions

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Howells <dhowells@redhat.com>
LKML-Reference: <20110206192106.401266547@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agofrv: Convert mb93093 irq_chip to new function
Thomas Gleixner [Sun, 6 Feb 2011 19:20:36 +0000]
frv: Convert mb93093 irq_chip to new function

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Howells <dhowells@redhat.com>
LKML-Reference: <20110206192106.300303769@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agofrv: Convert mb93091 irq_chip to new functions
Thomas Gleixner [Sun, 6 Feb 2011 19:20:35 +0000]
frv: Convert mb93091 irq_chip to new functions

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Howells <dhowells@redhat.com>
LKML-Reference: <20110206192106.203431646@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agofrv: Fix typo from __do_IRQ overhaul
Thomas Gleixner [Sun, 6 Feb 2011 19:20:34 +0000]
frv: Fix typo from __do_IRQ overhaul

Compiles way better.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Howells <dhowells@redhat.com>
LKML-Reference: <20110206192106.109992056@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agofrv: Remove stale irq_chip.end
Thomas Gleixner [Sun, 6 Feb 2011 19:20:33 +0000]
frv: Remove stale irq_chip.end

irq_chip.end got obsolete with the removal of __do_IRQ().

irq-mb93093.c even lacks an implementation, but nobody noticed that
it's broken since commit 88d6e1 in 2006.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Howells <dhowells@redhat.com>
LKML-Reference: <20110206192106.011224503@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agom68k: Convert irq function namespace
Thomas Gleixner [Mon, 28 Mar 2011 11:31:17 +0000]
m68k: Convert irq function namespace

Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agoxen: Use new irq_move functions
Thomas Gleixner [Thu, 24 Mar 2011 20:31:25 +0000]
xen: Use new irq_move functions

These functions take irq_data as an argument and avoid a redundant
lookup in the sparse irq case.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

8 years agoxen: Cleanup genirq namespace
Thomas Gleixner [Fri, 25 Mar 2011 09:58:06 +0000]
xen: Cleanup genirq namespace

Converted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agounicore32: Use generic show_interrupts()
Thomas Gleixner [Thu, 24 Mar 2011 17:26:42 +0000]
unicore32: Use generic show_interrupts()

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agounicore32: Convert to new irq function names
Thomas Gleixner [Thu, 24 Mar 2011 17:26:16 +0000]
unicore32: Convert to new irq function names

Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agosparc: Use generic show_interrupts()
Thomas Gleixner [Thu, 24 Mar 2011 17:03:13 +0000]
sparc: Use generic show_interrupts()

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: sparclinux@vger.kernel.org

8 years agosparc: Convert to new irq function names
Thomas Gleixner [Thu, 24 Mar 2011 16:52:54 +0000]
sparc: Convert to new irq function names

Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: sparclinux@vger.kernel.org

8 years agosparc: Cleanup direct irq_desc access
Thomas Gleixner [Thu, 24 Mar 2011 16:57:12 +0000]
sparc: Cleanup direct irq_desc access

Use the proper wrapper functions.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: sparclinux@vger.kernel.org

8 years agosparc: Use the new genirq functionality
Thomas Gleixner [Thu, 24 Mar 2011 08:03:45 +0000]
sparc: Use the new genirq functionality

Make use of the new features in genirq:

1) Set the chip flag IRCHIP_EOI_IF_HANDLED, which ensures in the
   core code that irq_eoi() is only called when the interrupt was
   handled. That removes the extra status check in the callback.

2) Use the preflow handler, which is called from the fasteoi core code
   before the device handler. That avoids another status check and the
   open coded handler redirection.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: sparclinux@vger.kernel.org

8 years agosh: Convert to new function names
Thomas Gleixner [Thu, 24 Mar 2011 15:31:17 +0000]
sh: Convert to new function names

Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agosh: Use the proper accessor functions
Thomas Gleixner [Thu, 24 Mar 2011 13:47:46 +0000]
sh: Use the proper accessor functions

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

8 years agopowerpc: Use generic show_interrupts()
Thomas Gleixner [Fri, 25 Mar 2011 16:04:59 +0000]
powerpc: Use generic show_interrupts()

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>