| From c73c5e4e4353762705381d51bd245151bbf26fa2 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> |
| Date: Fri, 24 Jan 2014 09:44:02 +0100 |
| Subject: 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> |
| (cherry picked from commit 29f397b739ceef90c8b848f6579cbacd088e896e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/spi/spi-rspi.c | 4 +--- |
| 1 file changed, 1 insertion(+), 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) |
| struct spi_master *master; |
| struct rspi_data *rspi; |
| int ret; |
| - char clk_name[16]; |
| const struct rspi_plat_data *rspi_pd = dev_get_platdata(&pdev->dev); |
| const struct spi_ops *ops; |
| const struct platform_device_id *id_entry = pdev->id_entry; |
| @@ -1034,8 +1033,7 @@ static int rspi_probe(struct platform_device *pdev) |
| goto error1; |
| } |
| |
| - snprintf(clk_name, sizeof(clk_name), "%s%d", id_entry->name, pdev->id); |
| - rspi->clk = devm_clk_get(&pdev->dev, clk_name); |
| + rspi->clk = devm_clk_get(&pdev->dev, NULL); |
| if (IS_ERR(rspi->clk)) { |
| dev_err(&pdev->dev, "cannot get clock\n"); |
| ret = PTR_ERR(rspi->clk); |
| -- |
| 2.1.2 |
| |
