diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 12:05:51 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 12:05:51 -0800 |
commit | 06991c28f37ad68e5c03777f5c3b679b56e3dac1 (patch) | |
tree | 4be75788e21c3c644fe6d39abf47693a171cf4f8 /sound/soc | |
parent | 460dc1eecf37263c8e3b17685ef236f0d236facb (diff) | |
parent | 74fef7a8fd1d2bd94f925d6638bb4c3049e7c381 (diff) | |
download | linux-06991c28f37ad68e5c03777f5c3b679b56e3dac1.tar.bz2 |
Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core patches from Greg Kroah-Hartman:
"Here is the big driver core merge for 3.9-rc1
There are two major series here, both of which touch lots of drivers
all over the kernel, and will cause you some merge conflicts:
- add a new function called devm_ioremap_resource() to properly be
able to check return values.
- remove CONFIG_EXPERIMENTAL
Other than those patches, there's not much here, some minor fixes and
updates"
Fix up trivial conflicts
* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
base: memory: fix soft/hard_offline_page permissions
drivercore: Fix ordering between deferred_probe and exiting initcalls
backlight: fix class_find_device() arguments
TTY: mark tty_get_device call with the proper const values
driver-core: constify data for class_find_device()
firmware: Ignore abort check when no user-helper is used
firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
firmware: Make user-mode helper optional
firmware: Refactoring for splitting user-mode helper code
Driver core: treat unregistered bus_types as having no devices
watchdog: Convert to devm_ioremap_resource()
thermal: Convert to devm_ioremap_resource()
spi: Convert to devm_ioremap_resource()
power: Convert to devm_ioremap_resource()
mtd: Convert to devm_ioremap_resource()
mmc: Convert to devm_ioremap_resource()
mfd: Convert to devm_ioremap_resource()
media: Convert to devm_ioremap_resource()
iommu: Convert to devm_ioremap_resource()
drm: Convert to devm_ioremap_resource()
...
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/cirrus/ep93xx-ac97.c | 7 | ||||
-rw-r--r-- | sound/soc/cirrus/ep93xx-i2s.c | 6 | ||||
-rw-r--r-- | sound/soc/codecs/jz4740.c | 6 | ||||
-rw-r--r-- | sound/soc/fsl/imx-audmux.c | 6 | ||||
-rw-r--r-- | sound/soc/fsl/imx-ssi.c | 7 | ||||
-rw-r--r-- | sound/soc/kirkwood/kirkwood-i2s.c | 8 | ||||
-rw-r--r-- | sound/soc/mxs/mxs-saif.c | 8 | ||||
-rw-r--r-- | sound/soc/pxa/mmp-sspa.c | 6 |
8 files changed, 25 insertions, 29 deletions
diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index f3f50e6fd6eb..1738d28fb04f 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -11,6 +11,7 @@ */ #include <linux/delay.h> +#include <linux/err.h> #include <linux/io.h> #include <linux/init.h> #include <linux/module.h> @@ -367,9 +368,9 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) if (!res) return -ENODEV; - info->regs = devm_request_and_ioremap(&pdev->dev, res); - if (!info->regs) - return -ENXIO; + info->regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(info->regs)) + return PTR_ERR(info->regs); irq = platform_get_irq(pdev, 0); if (!irq) diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 3365d4e843b7..323ed69b7975 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -380,9 +380,9 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) if (!res) return -ENODEV; - info->regs = devm_request_and_ioremap(&pdev->dev, res); - if (!info->regs) - return -ENXIO; + info->regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(info->regs)) + return PTR_ERR(info->regs); info->mclk = clk_get(&pdev->dev, "mclk"); if (IS_ERR(info->mclk)) { diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index d991529e1aff..5f607b35b68b 100644 --- a/sound/soc/codecs/jz4740.c +++ b/sound/soc/codecs/jz4740.c @@ -361,9 +361,9 @@ static int jz4740_codec_probe(struct platform_device *pdev) return -ENOMEM; mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - base = devm_request_and_ioremap(&pdev->dev, mem); - if (!base) - return -EBUSY; + base = devm_ioremap_resource(&pdev->dev, mem); + if (IS_ERR(base)) + return PTR_ERR(base); jz4740_codec->regmap = devm_regmap_init_mmio(&pdev->dev, base, &jz4740_codec_regmap_config); diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index fab912ea7a50..3f333e5b4673 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c @@ -252,9 +252,9 @@ static int imx_audmux_probe(struct platform_device *pdev) of_match_device(imx_audmux_dt_ids, &pdev->dev); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - audmux_base = devm_request_and_ioremap(&pdev->dev, res); - if (!audmux_base) - return -EADDRNOTAVAIL; + audmux_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(audmux_base)) + return PTR_ERR(audmux_base); pinctrl = devm_pinctrl_get_select_default(&pdev->dev); if (IS_ERR(pinctrl)) { diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 3b480423747f..55464a5b0706 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -550,10 +550,9 @@ static int imx_ssi_probe(struct platform_device *pdev) goto failed_get_resource; } - ssi->base = devm_request_and_ioremap(&pdev->dev, res); - if (!ssi->base) { - dev_err(&pdev->dev, "ioremap failed\n"); - ret = -ENODEV; + ssi->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(ssi->base)) { + ret = PTR_ERR(ssi->base); goto failed_register; } diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 282d8b1163ba..c74c89065493 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -472,11 +472,9 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) return -ENXIO; } - priv->io = devm_request_and_ioremap(&pdev->dev, mem); - if (!priv->io) { - dev_err(&pdev->dev, "devm_request_and_ioremap failed\n"); - return -ENOMEM; - } + priv->io = devm_ioremap_resource(&pdev->dev, mem); + if (IS_ERR(priv->io)) + return PTR_ERR(priv->io); priv->irq = platform_get_irq(pdev, 0); if (priv->irq <= 0) { diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index e70e6c844f96..3a2aa1d19b93 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -717,11 +717,9 @@ static int mxs_saif_probe(struct platform_device *pdev) iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); - saif->base = devm_request_and_ioremap(&pdev->dev, iores); - if (!saif->base) { - dev_err(&pdev->dev, "ioremap failed\n"); - return -ENODEV; - } + saif->base = devm_ioremap_resource(&pdev->dev, iores); + if (IS_ERR(saif->base)) + return PTR_ERR(saif->base); dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0); if (!dmares) { diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c index 41c3a09b53ea..9140c4abafbc 100644 --- a/sound/soc/pxa/mmp-sspa.c +++ b/sound/soc/pxa/mmp-sspa.c @@ -429,9 +429,9 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev) if (res == NULL) return -ENOMEM; - priv->sspa->mmio_base = devm_request_and_ioremap(&pdev->dev, res); - if (priv->sspa->mmio_base == NULL) - return -ENODEV; + priv->sspa->mmio_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(priv->sspa->mmio_base)) + return PTR_ERR(priv->sspa->mmio_base); priv->sspa->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(priv->sspa->clk)) |