From: Geert Uytterhoeven Date: Fri, 24 Jan 2014 08:44:02 +0000 (+0100) Subject: spi: rspi: Use NULL as the clock ID X-Git-Tag: upstream/snapshot3+hdmi~955 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70b9e2e13663cb82cba5db1b395a31d41a026c48;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Signed-off-by: Mark Brown (cherry picked from commit 29f397b739ceef90c8b848f6579cbacd088e896e) Signed-off-by: Simon Horman --- diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index a648b40..d79a7ed 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);