---

yaml --- r: 343647 b: refs/heads/master c: 078b6ea h: refs/heads/master i: 343645: 610fa6a 343643: 97db1fe 343639: f56035e 343631: 6fbc0c7 343615: c105538 v: v3
git-mirror · Dec 6, 2012 · 03c054a · 03c054a
1 parent ae8ce50
commit 03c054a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3a223ee2d1a4635b0643c547bc0096a37334ed1
+refs/heads/master: 078b6ead72a6486c479f8b95c71dcb3b93abda90
diff --git a/trunk/drivers/spi/spi-sh-msiof.c b/trunk/drivers/spi/spi-sh-msiof.c
@@ -597,7 +597,6 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
 	struct resource	*r;
 	struct spi_master *master;
 	struct sh_msiof_spi_priv *p;
-	char clk_name[16];
 	int i;
 	int ret;
 
@@ -614,10 +613,9 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
 	p->info = pdev->dev.platform_data;
 	init_completion(&p->done);
 
-	snprintf(clk_name, sizeof(clk_name), "msiof%d", pdev->id);
-	p->clk = clk_get(&pdev->dev, clk_name);
+	p->clk = clk_get(&pdev->dev, NULL);
 	if (IS_ERR(p->clk)) {
-		dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
+		dev_err(&pdev->dev, "cannot get clock\n");
 		ret = PTR_ERR(p->clk);
 		goto err1;
 	}