From 5c46b22235c081c65096f638878812ae0fe94ff8 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Tue, 12 Mar 2013 00:13:47 +0100
Subject: [PATCH] --- yaml --- r: 365215 b: refs/heads/master c:
 b66c7730027509620ced3c7ebc84e28f623ebe9a h: refs/heads/master i:   365213:
 0bf58aa08efbbfa1ceb359fdc89716920d5811ea   365211:
 3e2609bf99326dc5da6514dbd772fbacdc62c366   365207:
 3e21d27aaa275c83ed19f1b93344eb1058b64c65   365199:
 a342b1f6bbe69393c65385a8d1d51623f9b88745   365183:
 854ae2fb743bd98d9fed84dccfda3d149340d1e9 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/spi/spi-bcm63xx.c | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 11377517f7ef..76fa4a412898 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68792e2a1989bf34a9498356c3e3cc70b9231df2
+refs/heads/master: b66c7730027509620ced3c7ebc84e28f623ebe9a
diff --git a/trunk/drivers/spi/spi-bcm63xx.c b/trunk/drivers/spi/spi-bcm63xx.c
index 2d64db4ac6a2..973099bd760d 100644
--- a/trunk/drivers/spi/spi-bcm63xx.c
+++ b/trunk/drivers/spi/spi-bcm63xx.c
@@ -412,18 +412,9 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
 	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;
 	}