Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e428c6a2 authored by John Stultz's avatar John Stultz
Browse files

RTC: Clean out UIE icotl implementations 



With the generic RTC rework, the UIE mode irqs are handled
in the generic layer, and only hardware specific ioctls
get passed down to the rtc driver layer.

So this patch removes the UIE mode ioctl handling in the rtc
driver layer, which never get used.

CC: Thomas Gleixner <tglx@linutronix.de>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
CC: rtc-linux@googlegroups.com
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 51ba60c5

drivers/rtc/rtc-at91rm9200.c

+0 −28
Original line number Diff line number Diff line
@@ -183,33 +183,6 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) 
	return 0;

}



/*

 * Handle commands from user-space

 */

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

			unsigned long arg)

{

	int ret = 0;



	pr_debug("%s(): cmd=%08x, arg=%08lx.\n", __func__, cmd, arg);



	/* important:  scrub old status before enabling IRQs */

	switch (cmd) {

	case RTC_UIE_OFF:	/* update off */

		at91_sys_write(AT91_RTC_IDR, AT91_RTC_SECEV);

		break;

	case RTC_UIE_ON:	/* update on */

		at91_sys_write(AT91_RTC_SCCR, AT91_RTC_SECEV);

		at91_sys_write(AT91_RTC_IER, AT91_RTC_SECEV);

		break;

	default:

		ret = -ENOIOCTLCMD;

		break;

	}



	return ret;

}



static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)

{

	pr_debug("%s(): cmd=%08x\n", __func__, enabled);
@@ -269,7 +242,6 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id) 
}



static const struct rtc_class_ops at91_rtc_ops = {

	.ioctl		= at91_rtc_ioctl,

	.read_time	= at91_rtc_readtime,

	.set_time	= at91_rtc_settime,

	.read_alarm	= at91_rtc_readalarm,

drivers/rtc/rtc-at91sam9.c

+0 −28
Original line number Diff line number Diff line
@@ -216,33 +216,6 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) 
	return 0;

}



/*

 * Handle commands from user-space

 */

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

			unsigned long arg)

{

	struct sam9_rtc *rtc = dev_get_drvdata(dev);

	int ret = 0;

	u32 mr = rtt_readl(rtc, MR);



	dev_dbg(dev, "ioctl: cmd=%08x, arg=%08lx, mr %08x\n", cmd, arg, mr);



	switch (cmd) {

	case RTC_UIE_OFF:		/* update off */

		rtt_writel(rtc, MR, mr & ~AT91_RTT_RTTINCIEN);

		break;

	case RTC_UIE_ON:		/* update on */

		rtt_writel(rtc, MR, mr | AT91_RTT_RTTINCIEN);

		break;

	default:

		ret = -ENOIOCTLCMD;

		break;

	}



	return ret;

}



static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)

{

	struct sam9_rtc *rtc = dev_get_drvdata(dev);
@@ -303,7 +276,6 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *_rtc) 
}



static const struct rtc_class_ops at91_rtc_ops = {

	.ioctl		= at91_rtc_ioctl,

	.read_time	= at91_rtc_readtime,

	.set_time	= at91_rtc_settime,

	.read_alarm	= at91_rtc_readalarm,

drivers/rtc/rtc-bfin.c

+0 −27
Original line number Diff line number Diff line
@@ -240,32 +240,6 @@ static void bfin_rtc_int_set_alarm(struct bfin_rtc *rtc) 
	 */

	bfin_rtc_int_set(rtc->rtc_alarm.tm_yday == -1 ? RTC_ISTAT_ALARM : RTC_ISTAT_ALARM_DAY);

}

static int bfin_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)

{

	struct bfin_rtc *rtc = dev_get_drvdata(dev);

	int ret = 0;



	dev_dbg_stamp(dev);



	bfin_rtc_sync_pending(dev);



	switch (cmd) {

	case RTC_UIE_ON:

		dev_dbg_stamp(dev);

		bfin_rtc_int_set(RTC_ISTAT_SEC);

		break;

	case RTC_UIE_OFF:

		dev_dbg_stamp(dev);

		bfin_rtc_int_clear(~RTC_ISTAT_SEC);

		break;



	default:

		dev_dbg_stamp(dev);

		ret = -ENOIOCTLCMD;

	}



	return ret;

}



static int bfin_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)

{
@@ -358,7 +332,6 @@ static int bfin_rtc_proc(struct device *dev, struct seq_file *seq) 
}



static struct rtc_class_ops bfin_rtc_ops = {

	.ioctl         = bfin_rtc_ioctl,

	.read_time     = bfin_rtc_read_time,

	.set_time      = bfin_rtc_set_time,

	.read_alarm    = bfin_rtc_read_alarm,

drivers/rtc/rtc-davinci.c

+0 −4
Original line number Diff line number Diff line
@@ -231,10 +231,6 @@ davinci_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) 
	case RTC_WIE_OFF:

		rtc_ctrl &= ~PRTCSS_RTC_CTRL_WEN;

		break;

	case RTC_UIE_OFF:

	case RTC_UIE_ON:

		ret = -ENOTTY;

		break;

	default:

		ret = -ENOIOCTLCMD;

	}

drivers/rtc/rtc-omap.c

+0 −39
Original line number Diff line number Diff line
@@ -135,44 +135,6 @@ static irqreturn_t rtc_irq(int irq, void *rtc) 
	return IRQ_HANDLED;

}



#ifdef	CONFIG_RTC_INTF_DEV



static int

omap_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)

{

	u8 reg;



	switch (cmd) {

	case RTC_UIE_OFF:

	case RTC_UIE_ON:

		break;

	default:

		return -ENOIOCTLCMD;

	}



	local_irq_disable();

	rtc_wait_not_busy();

	reg = rtc_read(OMAP_RTC_INTERRUPTS_REG);

	switch (cmd) {

	/* UIE = Update Interrupt Enable (1/second) */

	case RTC_UIE_OFF:

		reg &= ~OMAP_RTC_INTERRUPTS_IT_TIMER;

		break;

	case RTC_UIE_ON:

		reg |= OMAP_RTC_INTERRUPTS_IT_TIMER;

		break;

	}

	rtc_wait_not_busy();

	rtc_write(reg, OMAP_RTC_INTERRUPTS_REG);

	local_irq_enable();



	return 0;

}



#else

#define	omap_rtc_ioctl	NULL

#endif



static int omap_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)

{

	u8 reg;
@@ -313,7 +275,6 @@ static int omap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) 
}



static struct rtc_class_ops omap_rtc_ops = {

	.ioctl		= omap_rtc_ioctl,

	.read_time	= omap_rtc_read_time,

	.set_time	= omap_rtc_set_time,

	.read_alarm	= omap_rtc_read_alarm,