diff options
author | Bastian Hecht <hechtb@gmail.com> | 2012-11-07 06:40:04 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-12-06 09:05:00 -0500 |
commit | 078b6ead72a6486c479f8b95c71dcb3b93abda90 (patch) | |
tree | 74f4560b372a0ca9ef3ff6bb1220f0f84d27d772 /drivers/spi/spi-sh-msiof.c | |
parent | b3a223ee2d1a4635b0643c547bc0096a37334ed1 (diff) |
spi/sh-msiof: Remove unneeded clock name
clk_get() no longer needs a character string for associating the right
clock as this is done via the device struct now.
Signed-off-by: Bastian Hecht <hechtb@gmail.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi/spi-sh-msiof.c')
-rw-r--r-- | drivers/spi/spi-sh-msiof.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 1f466bc66d9d..96358d0eabb7 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 | } |