[MTD] Remove mtd->{suspend,resume} calls from board drivers (ccd93854) · Commits · e / devices / android_kernel_teracube_emerald

drivers/mtd/maps/physmap.c

+0 −40

Original line number	Original line	Diff line number	Diff line
	@@ -195,42 +195,6 @@ static int physmap_flash_probe(struct platform_device *dev)
	}		}

	#ifdef CONFIG_PM		#ifdef CONFIG_PM
	static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state)
	{
	struct physmap_flash_info *info = platform_get_drvdata(dev);
	int ret = 0;
	int i;

	for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
	if (info->mtd[i]->suspend) {
	ret = info->mtd[i]->suspend(info->mtd[i]);
	if (ret)
	goto fail;
	}

	return 0;
	fail:
	for (--i; i >= 0; --i)
	if (info->mtd[i]->suspend) {
	BUG_ON(!info->mtd[i]->resume);
	info->mtd[i]->resume(info->mtd[i]);
	}

	return ret;
	}

	static int physmap_flash_resume(struct platform_device *dev)
	{
	struct physmap_flash_info *info = platform_get_drvdata(dev);
	int i;

	for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
	if (info->mtd[i]->resume)
	info->mtd[i]->resume(info->mtd[i]);

	return 0;
	}

	static void physmap_flash_shutdown(struct platform_device *dev)		static void physmap_flash_shutdown(struct platform_device *dev)
	{		{
	struct physmap_flash_info *info = platform_get_drvdata(dev);		struct physmap_flash_info *info = platform_get_drvdata(dev);
	@@ -242,16 +206,12 @@ static void physmap_flash_shutdown(struct platform_device *dev)
	info->mtd[i]->resume(info->mtd[i]);		info->mtd[i]->resume(info->mtd[i]);
	}		}
	#else		#else
	#define physmap_flash_suspend NULL
	#define physmap_flash_resume NULL
	#define physmap_flash_shutdown NULL		#define physmap_flash_shutdown NULL
	#endif		#endif

	static struct platform_driver physmap_flash_driver = {		static struct platform_driver physmap_flash_driver = {
	.probe = physmap_flash_probe,		.probe = physmap_flash_probe,
	.remove = physmap_flash_remove,		.remove = physmap_flash_remove,
	.suspend = physmap_flash_suspend,
	.resume = physmap_flash_resume,
	.shutdown = physmap_flash_shutdown,		.shutdown = physmap_flash_shutdown,
	.driver = {		.driver = {
	.name = "physmap-flash",		.name = "physmap-flash",

drivers/mtd/maps/pxa2xx-flash.c

+0 −22

Original line number	Original line	Diff line number	Diff line
	@@ -140,24 +140,6 @@ static int __devexit pxa2xx_flash_remove(struct platform_device *dev)
	}		}

	#ifdef CONFIG_PM		#ifdef CONFIG_PM
	static int pxa2xx_flash_suspend(struct platform_device *dev, pm_message_t state)
	{
	struct pxa2xx_flash_info *info = platform_get_drvdata(dev);
	int ret = 0;

	if (info->mtd && info->mtd->suspend)
	ret = info->mtd->suspend(info->mtd);
	return ret;
	}

	static int pxa2xx_flash_resume(struct platform_device *dev)
	{
	struct pxa2xx_flash_info *info = platform_get_drvdata(dev);

	if (info->mtd && info->mtd->resume)
	info->mtd->resume(info->mtd);
	return 0;
	}
	static void pxa2xx_flash_shutdown(struct platform_device *dev)		static void pxa2xx_flash_shutdown(struct platform_device *dev)
	{		{
	struct pxa2xx_flash_info *info = platform_get_drvdata(dev);		struct pxa2xx_flash_info *info = platform_get_drvdata(dev);
	@@ -166,8 +148,6 @@ static void pxa2xx_flash_shutdown(struct platform_device *dev)
	info->mtd->resume(info->mtd);		info->mtd->resume(info->mtd);
	}		}
	#else		#else
	#define pxa2xx_flash_suspend NULL
	#define pxa2xx_flash_resume NULL
	#define pxa2xx_flash_shutdown NULL		#define pxa2xx_flash_shutdown NULL
	#endif		#endif

	@@ -178,8 +158,6 @@ static struct platform_driver pxa2xx_flash_driver = {
	},		},
	.probe = pxa2xx_flash_probe,		.probe = pxa2xx_flash_probe,
	.remove = __devexit_p(pxa2xx_flash_remove),		.remove = __devexit_p(pxa2xx_flash_remove),
	.suspend = pxa2xx_flash_suspend,
	.resume = pxa2xx_flash_resume,
	.shutdown = pxa2xx_flash_shutdown,		.shutdown = pxa2xx_flash_shutdown,
	};		};

drivers/mtd/maps/rbtx4939-flash.c

+0 −23

Original line number	Original line	Diff line number	Diff line
	@@ -145,25 +145,6 @@ static int rbtx4939_flash_probe(struct platform_device *dev)
	}		}

	#ifdef CONFIG_PM		#ifdef CONFIG_PM
	static int rbtx4939_flash_suspend(struct platform_device *dev,
	pm_message_t state)
	{
	struct rbtx4939_flash_info *info = platform_get_drvdata(dev);

	if (info->mtd->suspend)
	return info->mtd->suspend(info->mtd);
	return 0;
	}

	static int rbtx4939_flash_resume(struct platform_device *dev)
	{
	struct rbtx4939_flash_info *info = platform_get_drvdata(dev);

	if (info->mtd->resume)
	info->mtd->resume(info->mtd);
	return 0;
	}

	static void rbtx4939_flash_shutdown(struct platform_device *dev)		static void rbtx4939_flash_shutdown(struct platform_device *dev)
	{		{
	struct rbtx4939_flash_info *info = platform_get_drvdata(dev);		struct rbtx4939_flash_info *info = platform_get_drvdata(dev);
	@@ -173,16 +154,12 @@ static void rbtx4939_flash_shutdown(struct platform_device *dev)
	info->mtd->resume(info->mtd);		info->mtd->resume(info->mtd);
	}		}
	#else		#else
	#define rbtx4939_flash_suspend NULL
	#define rbtx4939_flash_resume NULL
	#define rbtx4939_flash_shutdown NULL		#define rbtx4939_flash_shutdown NULL
	#endif		#endif

	static struct platform_driver rbtx4939_flash_driver = {		static struct platform_driver rbtx4939_flash_driver = {
	.probe = rbtx4939_flash_probe,		.probe = rbtx4939_flash_probe,
	.remove = rbtx4939_flash_remove,		.remove = rbtx4939_flash_remove,
	.suspend = rbtx4939_flash_suspend,
	.resume = rbtx4939_flash_resume,
	.shutdown = rbtx4939_flash_shutdown,		.shutdown = rbtx4939_flash_shutdown,
	.driver = {		.driver = {
	.name = "rbtx4939-flash",		.name = "rbtx4939-flash",

drivers/mtd/maps/sa1100-flash.c

+0 −23

Original line number	Original line	Diff line number	Diff line
	@@ -415,25 +415,6 @@ static int __exit sa1100_mtd_remove(struct platform_device *pdev)
	}		}

	#ifdef CONFIG_PM		#ifdef CONFIG_PM
	static int sa1100_mtd_suspend(struct platform_device *dev, pm_message_t state)
	{
	struct sa_info *info = platform_get_drvdata(dev);
	int ret = 0;

	if (info)
	ret = info->mtd->suspend(info->mtd);

	return ret;
	}

	static int sa1100_mtd_resume(struct platform_device *dev)
	{
	struct sa_info *info = platform_get_drvdata(dev);
	if (info)
	info->mtd->resume(info->mtd);
	return 0;
	}

	static void sa1100_mtd_shutdown(struct platform_device *dev)		static void sa1100_mtd_shutdown(struct platform_device *dev)
	{		{
	struct sa_info *info = platform_get_drvdata(dev);		struct sa_info *info = platform_get_drvdata(dev);
	@@ -441,16 +422,12 @@ static void sa1100_mtd_shutdown(struct platform_device *dev)
	info->mtd->resume(info->mtd);		info->mtd->resume(info->mtd);
	}		}
	#else		#else
	#define sa1100_mtd_suspend NULL
	#define sa1100_mtd_resume NULL
	#define sa1100_mtd_shutdown NULL		#define sa1100_mtd_shutdown NULL
	#endif		#endif

	static struct platform_driver sa1100_mtd_driver = {		static struct platform_driver sa1100_mtd_driver = {
	.probe = sa1100_mtd_probe,		.probe = sa1100_mtd_probe,
	.remove = __exit_p(sa1100_mtd_remove),		.remove = __exit_p(sa1100_mtd_remove),
	.suspend = sa1100_mtd_suspend,
	.resume = sa1100_mtd_resume,
	.shutdown = sa1100_mtd_shutdown,		.shutdown = sa1100_mtd_shutdown,
	.driver = {		.driver = {
	.name = "sa1100-mtd",		.name = "sa1100-mtd",

drivers/mtd/nand/mxc_nand.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1015,8 +1015,6 @@ static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
	int ret = 0;		int ret = 0;

	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");		DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
	if (info)
	ret = info->suspend(info);

	/* Disable the NFC clock */		/* Disable the NFC clock */
	clk_disable(nfc_clk); /* FIXME */		clk_disable(nfc_clk); /* FIXME */
	@@ -1033,9 +1031,6 @@ static int mxcnd_resume(struct platform_device *pdev)
	/* Enable the NFC clock */		/* Enable the NFC clock */
	clk_enable(nfc_clk); /* FIXME */		clk_enable(nfc_clk); /* FIXME */

	if (info)
	info->resume(info);

	return ret;		return ret;
	}		}