浏览代码

spi: falcon: Use devm_spi_register_master()

Use devm_spi_register_master() to make cleanup paths simpler,
and remove unnecessary remove().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by:  Thomas Langer <thomas.langer@lantiq.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Jingoo Han 11 年之前
父节点
当前提交
999b6e932b
共有 1 个文件被更改,包括 1 次插入11 次删除
  1. 1 11
      drivers/spi/spi-falcon.c

+ 1 - 11
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)
 	if (ret)
 		spi_master_put(master);
 		spi_master_put(master);
 	return ret;
 	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[] = {
 static const struct of_device_id falcon_sflash_match[] = {
 	{ .compatible = "lantiq,sflash-falcon" },
 	{ .compatible = "lantiq,sflash-falcon" },
 	{},
 	{},
@@ -456,7 +447,6 @@ MODULE_DEVICE_TABLE(of, falcon_sflash_match);
 
 
 static struct platform_driver falcon_sflash_driver = {
 static struct platform_driver falcon_sflash_driver = {
 	.probe	= falcon_sflash_probe,
 	.probe	= falcon_sflash_probe,
-	.remove	= falcon_sflash_remove,
 	.driver = {
 	.driver = {
 		.name	= DRV_NAME,
 		.name	= DRV_NAME,
 		.owner	= THIS_MODULE,
 		.owner	= THIS_MODULE,