1 files changed, 16 insertions, 16 deletions

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 9592b936b71b..72c5cdbe0791 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -109,9 +109,9 @@ int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs)
                                 err = rtc->ops->set_time(rtc->dev.parent,
                                                 &new);
                 }
-        }
-        else
+        } else {
                 err = -EINVAL;
+        }
 
         mutex_unlock(&rtc->ops_lock);
         /* A timer might have just expired */
@@ -367,14 +367,14 @@ int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
         err = mutex_lock_interruptible(&rtc->ops_lock);
         if (err)
                 return err;
-        if (rtc->aie_timer.enabled) {
+        if (rtc->aie_timer.enabled)
                 rtc_timer_remove(rtc, &rtc->aie_timer);
-        }
+
         rtc->aie_timer.node.expires = rtc_tm_to_ktime(alarm->time);
         rtc->aie_timer.period = ktime_set(0, 0);
-        if (alarm->enabled) {
+        if (alarm->enabled)
                 err = rtc_timer_enqueue(rtc, &rtc->aie_timer);
-        }
+
         mutex_unlock(&rtc->ops_lock);
         return err;
 }
@@ -587,16 +587,16 @@ void rtc_update_irq(struct rtc_device *rtc,
 }
 EXPORT_SYMBOL_GPL(rtc_update_irq);
 
-static int __rtc_match(struct device *dev, void *data)
+static int __rtc_match(struct device *dev, const void *data)
 {
-        char *name = (char *)data;
+        const char *name = data;
 
         if (strcmp(dev_name(dev), name) == 0)
                 return 1;
         return 0;
 }
 
-struct rtc_device *rtc_class_open(char *name)
+struct rtc_device *rtc_class_open(const char *name)
 {
         struct device *dev;
         struct rtc_device *rtc = NULL;
@@ -698,9 +698,9 @@ retry:
         spin_lock_irqsave(&rtc->irq_task_lock, flags);
         if (rtc->irq_task != NULL && task == NULL)
                 err = -EBUSY;
-        if (rtc->irq_task != task)
+        else if (rtc->irq_task != task)
                 err = -EACCES;
-        if (!err) {
+        else {
                 if (rtc_update_hrtimer(rtc, enabled) < 0) {
                         spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
                         cpu_relax();
@@ -734,9 +734,9 @@ retry:
         spin_lock_irqsave(&rtc->irq_task_lock, flags);
         if (rtc->irq_task != NULL && task == NULL)
                 err = -EBUSY;
-        if (rtc->irq_task != task)
+        else if (rtc->irq_task != task)
                 err = -EACCES;
-        if (!err) {
+        else {
                 rtc->irq_freq = freq;
                 if (rtc->pie_enabled && rtc_update_hrtimer(rtc, 1) < 0) {
                         spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
@@ -891,7 +891,7 @@ again:
  *
  * Kernel interface to initializing an rtc_timer.
  */
-void rtc_timer_init(struct rtc_timer *timer, void (*f)(void* p), void* data)
+void rtc_timer_init(struct rtc_timer *timer, void (*f)(void *p), void *data)
 {
         timerqueue_init(&timer->node);
         timer->enabled = 0;
@@ -907,7 +907,7 @@ void rtc_timer_init(struct rtc_timer *timer, void (*f)(void* p), void* data)
  *
  * Kernel interface to set an rtc_timer
  */
-int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer* timer,
+int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer *timer,
                         ktime_t expires, ktime_t period)
 {
         int ret = 0;
@@ -930,7 +930,7 @@ int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer* timer,
  *
  * Kernel interface to cancel an rtc_timer
  */
-int rtc_timer_cancel(struct rtc_device *rtc, struct rtc_timer* timer)
+int rtc_timer_cancel(struct rtc_device *rtc, struct rtc_timer *timer)
 {
         int ret = 0;
         mutex_lock(&rtc->ops_lock);