diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-25 04:51:21 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-25 04:51:21 -0400 |
commit | 52d85ebb7b639448e596a8577bf981f5b139f4fd (patch) | |
tree | 7632999ecf194b9863ad4a86533a91b9f78a28ce /drivers/spi/spi-pxa2xx.c | |
parent | 2ef2e60d2f4d470b0cb591baeaf942316c0673ed (diff) | |
parent | db9371b853e7cebce93f0775215ef297b8d0bf93 (diff) |
Merge remote-tracking branch 'spi/topic/bfin' into spi-next
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 64e1682c39b1..cb0e1f1137ad 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c | |||
@@ -1201,7 +1201,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) | |||
1201 | 1201 | ||
1202 | /* Register with the SPI framework */ | 1202 | /* Register with the SPI framework */ |
1203 | platform_set_drvdata(pdev, drv_data); | 1203 | platform_set_drvdata(pdev, drv_data); |
1204 | status = spi_register_master(master); | 1204 | status = devm_spi_register_master(&pdev->dev, master); |
1205 | if (status != 0) { | 1205 | if (status != 0) { |
1206 | dev_err(&pdev->dev, "problem registering spi master\n"); | 1206 | dev_err(&pdev->dev, "problem registering spi master\n"); |
1207 | goto out_error_clock_enabled; | 1207 | goto out_error_clock_enabled; |
@@ -1253,9 +1253,6 @@ static int pxa2xx_spi_remove(struct platform_device *pdev) | |||
1253 | /* Release SSP */ | 1253 | /* Release SSP */ |
1254 | pxa_ssp_free(ssp); | 1254 | pxa_ssp_free(ssp); |
1255 | 1255 | ||
1256 | /* Disconnect from the SPI framework */ | ||
1257 | spi_unregister_master(drv_data->master); | ||
1258 | |||
1259 | return 0; | 1256 | return 0; |
1260 | } | 1257 | } |
1261 | 1258 | ||