Merge branch 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[cascardo/linux.git] / drivers / rtc / rtc-at91sam9.c

diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index 5469c52..a3ad957 100644 (file)
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -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,