spi: omap-100k: remove pointless _remove function (84acfd43) · Commits · 戴 / test

Commit [: use devm_spi_register_master()] removed the last bit of omap1_spi100k_remove function that had side effects. After call to spi_unregister_master was removed, the function consisted of: 2. call to platform_get_drvdata whose return value was only used in: 2. call to spi_master_get_devdata whose return value was not used, 3. an if statement checking if zero was not zero, and 4. call to platform_get_resource whose return value was not used. Ah, yes, and of course, final return 0. ;) Since omap1_spi100k_remove no longer does anything, it can be safely removed. Signed-off-by:

Michal Nazarewicz <mina86@mina86.com> Signed-off-by:

Mark Brown <broonie@linaro.org>

drivers/spi/spi-omap-100k.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -470,31 +470,12 @@ err:
		return status;
		}

		static int omap1_spi100k_remove(struct platform_device *pdev)
		{
		struct spi_master *master;
		struct omap1_spi100k *spi100k;
		struct resource *r;
		int status = 0;

		master = platform_get_drvdata(pdev);
		spi100k = spi_master_get_devdata(master);

		if (status != 0)
		return status;

		r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

		return 0;
		}

		static struct platform_driver omap1_spi100k_driver = {
		.driver = {
		.name = "omap1_spi100k",
		.owner = THIS_MODULE,
		},
		.probe = omap1_spi100k_probe,
		.remove = omap1_spi100k_remove,
		};

		module_platform_driver(omap1_spi100k_driver);
		@@ -502,4 +483,3 @@ module_platform_driver(omap1_spi100k_driver);
		MODULE_DESCRIPTION("OMAP7xx SPI 100k controller driver");
		MODULE_AUTHOR("Fabrice Crohas <fcrohas@gmail.com>");
		MODULE_LICENSE("GPL");

Admin message