mtd: spear_smi: Move suspend/resume to follow dev_pm_ops (770daa43) · Commits · 戴 / test

drivers/mtd/devices/spear_smi.c

+17 −11

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include <linux/module.h>
		#include <linux/param.h>
		#include <linux/platform_device.h>
		#include <linux/pm.h>
		#include <linux/mtd/mtd.h>
		#include <linux/mtd/partitions.h>
		#include <linux/mtd/spear_smi.h>
		@@ -1086,29 +1087,33 @@ static int __devexit spear_smi_remove(struct platform_device *pdev)
		return 0;
		}

		int spear_smi_suspend(struct platform_device *pdev, pm_message_t state)
		#ifdef CONFIG_PM
		static int spear_smi_suspend(struct device *dev)
		{
		struct spear_smi *dev = platform_get_drvdata(pdev);
		struct spear_smi *sdev = dev_get_drvdata(dev);

		if (dev && dev->clk)
		clk_disable_unprepare(dev->clk);
		if (sdev && sdev->clk)
		clk_disable_unprepare(sdev->clk);

		return 0;
		}

		int spear_smi_resume(struct platform_device *pdev)
		static int spear_smi_resume(struct device *dev)
		{
		struct spear_smi *dev = platform_get_drvdata(pdev);
		struct spear_smi *sdev = dev_get_drvdata(dev);
		int ret = -EPERM;

		if (dev && dev->clk)
		ret = clk_prepare_enable(dev->clk);
		if (sdev && sdev->clk)
		ret = clk_prepare_enable(sdev->clk);

		if (!ret)
		spear_smi_hw_init(dev);
		spear_smi_hw_init(sdev);
		return ret;
		}

		static SIMPLE_DEV_PM_OPS(spear_smi_pm_ops, spear_smi_suspend, spear_smi_resume);
		#endif

		#ifdef CONFIG_OF
		static const struct of_device_id spear_smi_id_table[] = {
		{ .compatible = "st,spear600-smi" },
		@@ -1123,11 +1128,12 @@ static struct platform_driver spear_smi_driver = {
		.bus = &platform_bus_type,
		.owner = THIS_MODULE,
		.of_match_table = of_match_ptr(spear_smi_id_table),
		#ifdef CONFIG_PM
		.pm = &spear_smi_pm_ops,
		#endif
		},
		.probe = spear_smi_probe,
		.remove = __devexit_p(spear_smi_remove),
		.suspend = spear_smi_suspend,
		.resume = spear_smi_resume,
		};

		static int spear_smi_init(void)

Admin message