ASoC: Make WM8770 SPI usage unconditional (bc9c040d) · Commits · 戴 / test

sound/soc/codecs/wm8770.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -690,7 +690,6 @@ static const struct of_device_id wm8770_of_match[] = {
		};
		MODULE_DEVICE_TABLE(of, wm8770_of_match);

		#if defined(CONFIG_SPI_MASTER)
		static int __devinit wm8770_spi_probe(struct spi_device *spi)
		{
		struct wm8770_priv *wm8770;
		@@ -726,28 +725,23 @@ static struct spi_driver wm8770_spi_driver = {
		.probe = wm8770_spi_probe,
		.remove = __devexit_p(wm8770_spi_remove)
		};
		#endif

		static int __init wm8770_modinit(void)
		{
		int ret = 0;

		#if defined(CONFIG_SPI_MASTER)
		ret = spi_register_driver(&wm8770_spi_driver);
		if (ret) {
		printk(KERN_ERR "Failed to register wm8770 SPI driver: %d\n",
		ret);
		}
		#endif
		return ret;
		}
		module_init(wm8770_modinit);

		static void __exit wm8770_exit(void)
		{
		#if defined(CONFIG_SPI_MASTER)
		spi_unregister_driver(&wm8770_spi_driver);
		#endif
		}
		module_exit(wm8770_exit);