diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-04-23 13:55:36 +0000 |
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-04-23 13:55:36 +0000 |
| commit | e2428ebd83861f693ac94cbe2662021d4e7f3775 (patch) | |
| tree | 5ef4da4d4811465ed5574bd3d084fbf7cb928e21 /target/linux/brcm63xx/patches-3.8/014-spi-bcm63xx-use-devm_ioremap_resource.patch | |
| parent | e3dfb1052672f7359784de8d1002a8eafebc2b68 (diff) | |
bcm63xx: update patches with upstream submissions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36407 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.8/014-spi-bcm63xx-use-devm_ioremap_resource.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.8/014-spi-bcm63xx-use-devm_ioremap_resource.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.8/014-spi-bcm63xx-use-devm_ioremap_resource.patch b/target/linux/brcm63xx/patches-3.8/014-spi-bcm63xx-use-devm_ioremap_resource.patch new file mode 100644 index 000000000..82fbe6c94 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.8/014-spi-bcm63xx-use-devm_ioremap_resource.patch @@ -0,0 +1,36 @@ +From 95af2d7751d31ea07b7a0d8ec7030f6c62df0ae2 Mon Sep 17 00:00:00 2001 +From: Jonas Gorski <jogo@openwrt.org> +Date: Mon, 11 Mar 2013 14:20:33 +0100 +Subject: [PATCH 12/12] spi/bcm63xx: use devm_ioremap_resource() + +Use devm_ioremap_resource() which provides its own error messages. + +Signed-off-by: Jonas Gorski <jogo@openwrt.org> +--- + drivers/spi/spi-bcm63xx.c | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +--- a/drivers/spi/spi-bcm63xx.c ++++ b/drivers/spi/spi-bcm63xx.c +@@ -412,18 +412,9 @@ static int bcm63xx_spi_probe(struct plat + platform_set_drvdata(pdev, master); + bs->pdev = pdev; + +- if (!devm_request_mem_region(&pdev->dev, r->start, +- resource_size(r), PFX)) { +- dev_err(dev, "iomem request failed\n"); +- ret = -ENXIO; +- goto out_err; +- } +- +- bs->regs = devm_ioremap_nocache(&pdev->dev, r->start, +- resource_size(r)); +- if (!bs->regs) { +- dev_err(dev, "unable to ioremap regs\n"); +- ret = -ENOMEM; ++ bs->regs = devm_ioremap_resource(&pdev->dev, r); ++ if (IS_ERR(bs->regs)) { ++ ret = PTR_ERR(bs->regs); + goto out_err; + } + |