evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rtc: convert wm8350 use new alarm and update operations

Browse source 
These are the only two ioctls so the ioctl() function is also removed.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mark Brown 2009-03-31 15:24:46 -07:00 • committed by Linus Torvalds
parent 79955898f9
commit 47367a3ba4
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
drivers/rtc/rtc-wm8350.c
View file

@ -236,6 +236,17 @@ static int wm8350_rtc_start_alarm(struct wm8350 *wm8350)
return 0; return 0;
} }
static int wm8350_rtc_alarm_irq_enable(struct device *dev,
unsigned int enabled)
{
struct wm8350 *wm8350 = dev_get_drvdata(dev);
if (enabled)
return wm8350_rtc_start_alarm(wm8350);
else
return wm8350_rtc_stop_alarm(wm8350);
}
static int wm8350_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) static int wm8350_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
{ {
struct wm8350 *wm8350 = dev_get_drvdata(dev); struct wm8350 *wm8350 = dev_get_drvdata(dev);
@ -291,30 +302,15 @@ static int wm8350_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
return ret; return ret;
} }
/* static int wm8350_rtc_update_irq_enable(struct device *dev,
* Handle commands from user-space unsigned int enabled)
*/
static int wm8350_rtc_ioctl(struct device *dev, unsigned int cmd,
unsigned long arg)
{ {
struct wm8350 *wm8350 = dev_get_drvdata(dev); struct wm8350 *wm8350 = dev_get_drvdata(dev);
switch (cmd) { if (enabled)
case RTC_AIE_OFF:
return wm8350_rtc_stop_alarm(wm8350);
case RTC_AIE_ON:
return wm8350_rtc_start_alarm(wm8350);
case RTC_UIE_OFF:
wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_SEC);
break;
case RTC_UIE_ON:
wm8350_unmask_irq(wm8350, WM8350_IRQ_RTC_SEC); wm8350_unmask_irq(wm8350, WM8350_IRQ_RTC_SEC);
break; else
wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_SEC);
default:
return -ENOIOCTLCMD;
}
return 0; return 0;
} }
@ -345,11 +341,12 @@ static void wm8350_rtc_update_handler(struct wm8350 *wm8350, int irq,
} }
static const struct rtc_class_ops wm8350_rtc_ops = { static const struct rtc_class_ops wm8350_rtc_ops = {
.ioctl = wm8350_rtc_ioctl,
.read_time = wm8350_rtc_readtime, .read_time = wm8350_rtc_readtime,
.set_time = wm8350_rtc_settime, .set_time = wm8350_rtc_settime,
.read_alarm = wm8350_rtc_readalarm, .read_alarm = wm8350_rtc_readalarm,
.set_alarm = wm8350_rtc_setalarm, .set_alarm = wm8350_rtc_setalarm,
.alarm_irq_enable = wm8350_rtc_alarm_irq_enable,
.update_irq_enable = wm8350_rtc_update_irq_enable,
}; };
#ifdef CONFIG_PM #ifdef CONFIG_PM