|
@@ -1080,7 +1080,7 @@ static int omap_mcspi_runtime_resume(struct device *dev)
|
|
|
}
|
|
|
|
|
|
|
|
|
-static int __init omap2_mcspi_probe(struct platform_device *pdev)
|
|
|
+static int __devinit omap2_mcspi_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct spi_master *master;
|
|
|
struct omap2_mcspi_platform_config *pdata = pdev->dev.platform_data;
|
|
@@ -1212,7 +1212,7 @@ free_master:
|
|
|
return status;
|
|
|
}
|
|
|
|
|
|
-static int __exit omap2_mcspi_remove(struct platform_device *pdev)
|
|
|
+static int __devexit omap2_mcspi_remove(struct platform_device *pdev)
|
|
|
{
|
|
|
struct spi_master *master;
|
|
|
struct omap2_mcspi *mcspi;
|
|
@@ -1287,13 +1287,14 @@ static struct platform_driver omap2_mcspi_driver = {
|
|
|
.owner = THIS_MODULE,
|
|
|
.pm = &omap2_mcspi_pm_ops
|
|
|
},
|
|
|
- .remove = __exit_p(omap2_mcspi_remove),
|
|
|
+ .probe = omap2_mcspi_probe,
|
|
|
+ .remove = __devexit_p(omap2_mcspi_remove),
|
|
|
};
|
|
|
|
|
|
|
|
|
static int __init omap2_mcspi_init(void)
|
|
|
{
|
|
|
- return platform_driver_probe(&omap2_mcspi_driver, omap2_mcspi_probe);
|
|
|
+ return platform_driver_register(&omap2_mcspi_driver);
|
|
|
}
|
|
|
subsys_initcall(omap2_mcspi_init);
|
|
|
|