summaryrefslogtreecommitdiff
path: root/target/linux/brcm63xx/patches-3.9/014-spi-bcm63xx-use-devm_ioremap_resource.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm63xx/patches-3.9/014-spi-bcm63xx-use-devm_ioremap_resource.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.9/014-spi-bcm63xx-use-devm_ioremap_resource.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.9/014-spi-bcm63xx-use-devm_ioremap_resource.patch b/target/linux/brcm63xx/patches-3.9/014-spi-bcm63xx-use-devm_ioremap_resource.patch
new file mode 100644
index 0000000000..82fbe6c94b
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.9/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;
+ }
+