Merge remote-tracking branch 'spi/topic/sh-msiof' into spi-next (368ce0bc) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/spi/spi-sh-msiof.c

+0 −18

Original line number	Original line	Diff line number	Diff line
	@@ -745,18 +745,6 @@ static int sh_msiof_spi_remove(struct platform_device *pdev)
	return ret;		return ret;
	}		}

	static int sh_msiof_spi_runtime_nop(struct device *dev)
	{
	/* Runtime PM callback shared between ->runtime_suspend()
	* and ->runtime_resume(). Simply returns success.
	*
	* This driver re-initializes all registers after
	* pm_runtime_get_sync() anyway so there is no need
	* to save and restore registers here.
	*/
	return 0;
	}

	#ifdef CONFIG_OF		#ifdef CONFIG_OF
	static const struct of_device_id sh_msiof_match[] = {		static const struct of_device_id sh_msiof_match[] = {
	{ .compatible = "renesas,sh-msiof", },		{ .compatible = "renesas,sh-msiof", },
	@@ -766,18 +754,12 @@ static const struct of_device_id sh_msiof_match[] = {
	MODULE_DEVICE_TABLE(of, sh_msiof_match);		MODULE_DEVICE_TABLE(of, sh_msiof_match);
	#endif		#endif

	static struct dev_pm_ops sh_msiof_spi_dev_pm_ops = {
	.runtime_suspend = sh_msiof_spi_runtime_nop,
	.runtime_resume = sh_msiof_spi_runtime_nop,
	};

	static struct platform_driver sh_msiof_spi_drv = {		static struct platform_driver sh_msiof_spi_drv = {
	.probe = sh_msiof_spi_probe,		.probe = sh_msiof_spi_probe,
	.remove = sh_msiof_spi_remove,		.remove = sh_msiof_spi_remove,
	.driver = {		.driver = {
	.name = "spi_sh_msiof",		.name = "spi_sh_msiof",
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.pm = &sh_msiof_spi_dev_pm_ops,
	.of_match_table = of_match_ptr(sh_msiof_match),		.of_match_table = of_match_ptr(sh_msiof_match),
	},		},
	};		};