projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backport/v3.14.24-ltsi-rc1/sh-tmu-to-v3.18-rc1' into backport/v3.14.24...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
spi
/
spi-falcon.c
diff --git
a/drivers/spi/spi-falcon.c
b/drivers/spi/spi-falcon.c
index
c7a74f0
..
dd5bd46
100644
(file)
--- a/
drivers/spi/spi-falcon.c
+++ b/
drivers/spi/spi-falcon.c
@@
-433,21
+433,12
@@
static int falcon_sflash_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, priv);
platform_set_drvdata(pdev, priv);
- ret =
spi_register_master(
master);
+ ret =
devm_spi_register_master(&pdev->dev,
master);
if (ret)
spi_master_put(master);
return ret;
}
if (ret)
spi_master_put(master);
return ret;
}
-static int falcon_sflash_remove(struct platform_device *pdev)
-{
- struct falcon_sflash *priv = platform_get_drvdata(pdev);
-
- spi_unregister_master(priv->master);
-
- return 0;
-}
-
static const struct of_device_id falcon_sflash_match[] = {
{ .compatible = "lantiq,sflash-falcon" },
{},
static const struct of_device_id falcon_sflash_match[] = {
{ .compatible = "lantiq,sflash-falcon" },
{},
@@
-456,7
+447,6
@@
MODULE_DEVICE_TABLE(of, falcon_sflash_match);
static struct platform_driver falcon_sflash_driver = {
.probe = falcon_sflash_probe,
static struct platform_driver falcon_sflash_driver = {
.probe = falcon_sflash_probe,
- .remove = falcon_sflash_remove,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,