Commit 47367a3b authored by Mark Brown's avatar Mark Brown Committed by Linus Torvalds
Browse files

rtc: convert wm8350 use new alarm and update operations 



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

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 79955898

drivers/rtc/rtc-wm8350.c

+18 −21
Original line number Diff line number Diff line
@@ -236,6 +236,17 @@ static int wm8350_rtc_start_alarm(struct wm8350 *wm8350) 
	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)

{

	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;

}



/*

 * Handle commands from user-space

 */

static int wm8350_rtc_ioctl(struct device *dev, unsigned int cmd,

			    unsigned long arg)

static int wm8350_rtc_update_irq_enable(struct device *dev,

					unsigned int enabled)

{

	struct wm8350 *wm8350 = dev_get_drvdata(dev);



	switch (cmd) {

	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:

	if (enabled)

		wm8350_unmask_irq(wm8350, WM8350_IRQ_RTC_SEC);

		break;



	default:

		return -ENOIOCTLCMD;

	}

	else

		wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_SEC);



	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 = {

	.ioctl = wm8350_rtc_ioctl,

	.read_time = wm8350_rtc_readtime,

	.set_time = wm8350_rtc_settime,

	.read_alarm = wm8350_rtc_readalarm,

	.set_alarm = wm8350_rtc_setalarm,

	.alarm_irq_enable = wm8350_rtc_alarm_irq_enable,

	.update_irq_enable = wm8350_rtc_update_irq_enable,

};



#ifdef CONFIG_PM

CRA Git | Maintained and supported by SUSTech CRA and CCSE