summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:48:49 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:48:49 +0100
commit1f54f94284c316a338f75ed8804ff7e9aa92eee3 (patch)
tree0a694b8f715c05da615ee397a3cd6e6709d67839 /drivers/spi
parentdb04e17055c2d912a847f02a10deee1d82f96300 (diff)
parentc8b94d8492e6e3f938519517ae859f94820f9422 (diff)
Merge remote-tracking branch 'spi/topic/clps711x' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-clps711x.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 17965fe225cc..5655acf55bfe 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -239,11 +239,8 @@ static int spi_clps711x_probe(struct platform_device *pdev)
}
dev_err(&pdev->dev, "Failed to register master\n");
- devm_free_irq(&pdev->dev, IRQ_SSEOTI, hw);
clk_out:
- devm_clk_put(&pdev->dev, hw->spi_clk);
-
err_out:
while (--i >= 0)
if (gpio_is_valid(hw->chipselect[i]))
@@ -261,13 +258,10 @@ static int spi_clps711x_remove(struct platform_device *pdev)
struct spi_master *master = platform_get_drvdata(pdev);
struct spi_clps711x_data *hw = spi_master_get_devdata(master);
- devm_free_irq(&pdev->dev, IRQ_SSEOTI, hw);
-
for (i = 0; i < master->num_chipselect; i++)
if (gpio_is_valid(hw->chipselect[i]))
gpio_free(hw->chipselect[i]);
- devm_clk_put(&pdev->dev, hw->spi_clk);
spi_unregister_master(master);
kfree(master);