diff options
author | Geert Uytterhoeven <geert+renesas@linux-m68k.org> | 2014-01-24 03:44:02 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-27 15:07:38 -0500 |
commit | 29f397b739ceef90c8b848f6579cbacd088e896e (patch) | |
tree | 6a7337251573896ae95e6861fbbbecc949252154 /drivers/spi/spi-rspi.c | |
parent | 17fe0d9a28fe742c467f800625459cf7bcb44b3b (diff) |
spi: rspi: Use NULL as the clock ID
There's only one RSPI/QSPI clock, so we can use NULL as the clock ID
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-rspi.c')
-rw-r--r-- | drivers/spi/spi-rspi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index a648b40c271b..d79a7ed9b92e 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c | |||
@@ -1004,7 +1004,6 @@ static int rspi_probe(struct platform_device *pdev) | |||
1004 | struct spi_master *master; | 1004 | struct spi_master *master; |
1005 | struct rspi_data *rspi; | 1005 | struct rspi_data *rspi; |
1006 | int ret; | 1006 | int ret; |
1007 | char clk_name[16]; | ||
1008 | const struct rspi_plat_data *rspi_pd = dev_get_platdata(&pdev->dev); | 1007 | const struct rspi_plat_data *rspi_pd = dev_get_platdata(&pdev->dev); |
1009 | const struct spi_ops *ops; | 1008 | const struct spi_ops *ops; |
1010 | const struct platform_device_id *id_entry = pdev->id_entry; | 1009 | const struct platform_device_id *id_entry = pdev->id_entry; |
@@ -1034,8 +1033,7 @@ static int rspi_probe(struct platform_device *pdev) | |||
1034 | goto error1; | 1033 | goto error1; |
1035 | } | 1034 | } |
1036 | 1035 | ||
1037 | snprintf(clk_name, sizeof(clk_name), "%s%d", id_entry->name, pdev->id); | 1036 | rspi->clk = devm_clk_get(&pdev->dev, NULL); |
1038 | rspi->clk = devm_clk_get(&pdev->dev, clk_name); | ||
1039 | if (IS_ERR(rspi->clk)) { | 1037 | if (IS_ERR(rspi->clk)) { |
1040 | dev_err(&pdev->dev, "cannot get clock\n"); | 1038 | dev_err(&pdev->dev, "cannot get clock\n"); |
1041 | ret = PTR_ERR(rspi->clk); | 1039 | ret = PTR_ERR(rspi->clk); |