---

yaml --- r: 365215 b: refs/heads/master c: b66c773 h: refs/heads/master i: 365213: 0bf58aa 365211: 3e2609b 365207: 3e21d27 365199: a342b1f 365183: 854ae2f v: v3
git-mirror · Mar 12, 2013 · 5c46b22 · 5c46b22
1 parent 06fc88e
commit 5c46b22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git 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
@@ -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;
 	}