From 03c054a2efcf19fd50585064563eb870736d78e5 Mon Sep 17 00:00:00 2001 From: Bastian Hecht Date: Wed, 7 Nov 2012 12:40:04 +0100 Subject: [PATCH] --- yaml --- r: 343647 b: refs/heads/master c: 078b6ead72a6486c479f8b95c71dcb3b93abda90 h: refs/heads/master i: 343645: 610fa6a78709deb5c29580e1e7fd579448ba99ca 343643: 97db1fe60e4462788a6e35943db4388f83eef387 343639: f56035ebd07fcab4fa6b28adab46a2652a9b5b41 343631: 6fbc0c76c085af9b09a80193b728b791f182238b 343615: c1055388b60fc980a49911d61622b2f9e7933a58 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-sh-msiof.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index aa267f0c5ae6..d26849dd6cec 100644 --- 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 index 1f466bc66d9d..96358d0eabb7 100644 --- 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; }