summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-clps711x.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-25 12:51:21 +0400
committerMark Brown <broonie@linaro.org>2013-10-25 12:51:21 +0400
commit52d85ebb7b639448e596a8577bf981f5b139f4fd (patch)
tree7632999ecf194b9863ad4a86533a91b9f78a28ce /drivers/spi/spi-clps711x.c
parent2ef2e60d2f4d470b0cb591baeaf942316c0673ed (diff)
parentdb9371b853e7cebce93f0775215ef297b8d0bf93 (diff)
downloadlinux-52d85ebb7b639448e596a8577bf981f5b139f4fd.tar.xz
Merge remote-tracking branch 'spi/topic/bfin' into spi-next
Diffstat (limited to 'drivers/spi/spi-clps711x.c')
-rw-r--r--drivers/spi/spi-clps711x.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 6416798828e7..7f2fd33ad4d9 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -229,7 +229,7 @@ static int spi_clps711x_probe(struct platform_device *pdev)
goto clk_out;
}
- ret = spi_register_master(master);
+ ret = devm_spi_register_master(&pdev->dev, master);
if (!ret) {
dev_info(&pdev->dev,
"SPI bus driver initialized. Master clock %u Hz\n",
@@ -260,8 +260,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
if (gpio_is_valid(hw->chipselect[i]))
gpio_free(hw->chipselect[i]);
- spi_unregister_master(master);
-
return 0;
}