aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/spi/spi-sh-msiof.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 1f466bc66d9..96358d0eabb 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -597,7 +597,6 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
597 struct resource *r; 597 struct resource *r;
598 struct spi_master *master; 598 struct spi_master *master;
599 struct sh_msiof_spi_priv *p; 599 struct sh_msiof_spi_priv *p;
600 char clk_name[16];
601 int i; 600 int i;
602 int ret; 601 int ret;
603 602
@@ -614,10 +613,9 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
614 p->info = pdev->dev.platform_data; 613 p->info = pdev->dev.platform_data;
615 init_completion(&p->done); 614 init_completion(&p->done);
616 615
617 snprintf(clk_name, sizeof(clk_name), "msiof%d", pdev->id); 616 p->clk = clk_get(&pdev->dev, NULL);
618 p->clk = clk_get(&pdev->dev, clk_name);
619 if (IS_ERR(p->clk)) { 617 if (IS_ERR(p->clk)) {
620 dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name); 618 dev_err(&pdev->dev, "cannot get clock\n");
621 ret = PTR_ERR(p->clk); 619 ret = PTR_ERR(p->clk);
622 goto err1; 620 goto err1;
623 } 621 }