Commit 32e445aa authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

drivers/rtc/rtc-s3c.c: convert s3c_rtc to dev_pm_ops 



Instead of using legacy suspend/resume methods, using newer dev_pm_ops
structure allows better control over power management.  Also, 'wake_en'
variable is moved, because it is only used when CONFIG_PM_SLEEP is
enabled.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bc48b902

drivers/rtc/rtc-s3c.c

+13 −13
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ static struct clk *rtc_clk; 
static void __iomem *s3c_rtc_base;

static int s3c_rtc_alarmno = NO_IRQ;

static int s3c_rtc_tickno  = NO_IRQ;

static bool wake_en;

static enum s3c_cpu_type s3c_rtc_cpu_type;



static DEFINE_SPINLOCK(s3c_rtc_pie_lock);
@@ -579,14 +578,16 @@ static int s3c_rtc_probe(struct platform_device *pdev) 
	return ret;

}



#ifdef CONFIG_PM



#ifdef CONFIG_PM_SLEEP

/* RTC Power management control */



static int ticnt_save, ticnt_en_save;

static bool wake_en;



static int s3c_rtc_suspend(struct platform_device *pdev, pm_message_t state)

static int s3c_rtc_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);



	clk_enable(rtc_clk);

	/* save TICNT for anyone using periodic interrupts */

	ticnt_save = readb(s3c_rtc_base + S3C2410_TICNT);
@@ -596,19 +597,20 @@ static int s3c_rtc_suspend(struct platform_device *pdev, pm_message_t state) 
	}

	s3c_rtc_enable(pdev, 0);



	if (device_may_wakeup(&pdev->dev) && !wake_en) {

	if (device_may_wakeup(dev) && !wake_en) {

		if (enable_irq_wake(s3c_rtc_alarmno) == 0)

			wake_en = true;

		else

			dev_err(&pdev->dev, "enable_irq_wake failed\n");

			dev_err(dev, "enable_irq_wake failed\n");

	}

	clk_disable(rtc_clk);



	return 0;

}



static int s3c_rtc_resume(struct platform_device *pdev)

static int s3c_rtc_resume(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	unsigned int tmp;



	clk_enable(rtc_clk);
@@ -619,7 +621,7 @@ static int s3c_rtc_resume(struct platform_device *pdev) 
		writew(tmp | ticnt_en_save, s3c_rtc_base + S3C2410_RTCCON);

	}



	if (device_may_wakeup(&pdev->dev) && wake_en) {

	if (device_may_wakeup(dev) && wake_en) {

		disable_irq_wake(s3c_rtc_alarmno);

		wake_en = false;

	}
@@ -627,11 +629,10 @@ static int s3c_rtc_resume(struct platform_device *pdev) 


	return 0;

}

#else

#define s3c_rtc_suspend NULL

#define s3c_rtc_resume  NULL

#endif



static SIMPLE_DEV_PM_OPS(s3c_rtc_pm_ops, s3c_rtc_suspend, s3c_rtc_resume);



#ifdef CONFIG_OF

static struct s3c_rtc_drv_data s3c_rtc_drv_data_array[] = {

	[TYPE_S3C2410] = { TYPE_S3C2410 },
@@ -681,12 +682,11 @@ MODULE_DEVICE_TABLE(platform, s3c_rtc_driver_ids); 
static struct platform_driver s3c_rtc_driver = {

	.probe		= s3c_rtc_probe,

	.remove		= s3c_rtc_remove,

	.suspend	= s3c_rtc_suspend,

	.resume		= s3c_rtc_resume,

	.id_table	= s3c_rtc_driver_ids,

	.driver		= {

		.name	= "s3c-rtc",

		.owner	= THIS_MODULE,

		.pm	= &s3c_rtc_pm_ops,

		.of_match_table	= of_match_ptr(s3c_rtc_dt_match),

	},

};