diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2014-04-03 17:49:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 19:21:20 -0400 |
commit | 2fb004a9b00e34908e59a1c1c5770910690a7588 (patch) | |
tree | 871a45fc7c5f3b4a197e76e1c825f914ae57ff48 /drivers/rtc/rtc-mc13xxx.c | |
parent | 589e501439f9866b4bc415743b0ae0bb9a461c69 (diff) |
rtc: mc13xxx: simplify alarm_irq_enable()
This patch removes excess layer for alarm_irq_enable() function.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-mc13xxx.c')
-rw-r--r-- | drivers/rtc/rtc-mc13xxx.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c index 6b5d7d43af89..1fa2748ab40e 100644 --- a/drivers/rtc/rtc-mc13xxx.c +++ b/drivers/rtc/rtc-mc13xxx.c | |||
@@ -42,15 +42,15 @@ static int mc13xxx_rtc_irq_enable_unlocked(struct device *dev, | |||
42 | return func(priv->mc13xxx, irq); | 42 | return func(priv->mc13xxx, irq); |
43 | } | 43 | } |
44 | 44 | ||
45 | static int mc13xxx_rtc_irq_enable(struct device *dev, | 45 | static int mc13xxx_rtc_alarm_irq_enable(struct device *dev, |
46 | unsigned int enabled, int irq) | 46 | unsigned int enabled) |
47 | { | 47 | { |
48 | struct mc13xxx_rtc *priv = dev_get_drvdata(dev); | 48 | struct mc13xxx_rtc *priv = dev_get_drvdata(dev); |
49 | int ret; | 49 | int ret; |
50 | 50 | ||
51 | mc13xxx_lock(priv->mc13xxx); | 51 | mc13xxx_lock(priv->mc13xxx); |
52 | 52 | ||
53 | ret = mc13xxx_rtc_irq_enable_unlocked(dev, enabled, irq); | 53 | ret = mc13xxx_rtc_irq_enable_unlocked(dev, enabled, MC13XXX_IRQ_TODA); |
54 | 54 | ||
55 | mc13xxx_unlock(priv->mc13xxx); | 55 | mc13xxx_unlock(priv->mc13xxx); |
56 | 56 | ||
@@ -282,12 +282,6 @@ static irqreturn_t mc13xxx_rtc_update_handler(int irq, void *dev) | |||
282 | return IRQ_HANDLED; | 282 | return IRQ_HANDLED; |
283 | } | 283 | } |
284 | 284 | ||
285 | static int mc13xxx_rtc_alarm_irq_enable(struct device *dev, | ||
286 | unsigned int enabled) | ||
287 | { | ||
288 | return mc13xxx_rtc_irq_enable(dev, enabled, MC13XXX_IRQ_TODA); | ||
289 | } | ||
290 | |||
291 | static const struct rtc_class_ops mc13xxx_rtc_ops = { | 285 | static const struct rtc_class_ops mc13xxx_rtc_ops = { |
292 | .read_time = mc13xxx_rtc_read_time, | 286 | .read_time = mc13xxx_rtc_read_time, |
293 | .set_mmss = mc13xxx_rtc_set_mmss, | 287 | .set_mmss = mc13xxx_rtc_set_mmss, |