Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 999b6e93 authored by Jingoo Han's avatar Jingoo Han Committed by Mark Brown
Browse files

spi: falcon: Use devm_spi_register_master() 



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

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarThomas Langer <thomas.langer@lantiq.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6ce4eac1

drivers/spi/spi-falcon.c

+1 −11
Original line number Diff line number Diff line
@@ -433,21 +433,12 @@ static int falcon_sflash_probe(struct platform_device *pdev) 


	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;

}



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" },

	{},
@@ -456,7 +447,6 @@ MODULE_DEVICE_TABLE(of, falcon_sflash_match); 


static struct platform_driver falcon_sflash_driver = {

	.probe	= falcon_sflash_probe,

	.remove	= falcon_sflash_remove,

	.driver = {

		.name	= DRV_NAME,

		.owner	= THIS_MODULE,