diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2014-04-03 17:50:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 19:21:24 -0400 |
commit | 0d71915d27a6bfd896513c5aa3bae4a09ca81c2c (patch) | |
tree | 689745e59ebd5203eede1033cd2bce42bd9e0f91 | |
parent | ebe753357ecd10a6dc521dc89f2bfea6c0ee0ca2 (diff) |
rtc: treewide: remove excess rtc_device validation
The patch "rtc: verify a critical argument to rtc_update_irq() before
using it" introduces validation for rtc_device in the RTC core, so there
are no need to check this argument for rtc_update_irq() from the
drivers.
This patch removes such check for the existing rtc_update_irq() users.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/rtc/rtc-ds1511.c | 3 | ||||
-rw-r--r-- | drivers/rtc/rtc-ds1553.c | 3 | ||||
-rw-r--r-- | drivers/rtc/rtc-stk17ta8.c | 3 | ||||
-rw-r--r-- | drivers/rtc/rtc-tx4939.c | 4 |
4 files changed, 5 insertions, 8 deletions
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c index 4ff20f9dc212..b13d1399b81a 100644 --- a/drivers/rtc/rtc-ds1511.c +++ b/drivers/rtc/rtc-ds1511.c | |||
@@ -371,8 +371,7 @@ ds1511_interrupt(int irq, void *dev_id) | |||
371 | events |= RTC_UF; | 371 | events |= RTC_UF; |
372 | else | 372 | else |
373 | events |= RTC_AF; | 373 | events |= RTC_AF; |
374 | if (likely(pdata->rtc)) | 374 | rtc_update_irq(pdata->rtc, 1, events); |
375 | rtc_update_irq(pdata->rtc, 1, events); | ||
376 | } | 375 | } |
377 | spin_unlock(&pdata->lock); | 376 | spin_unlock(&pdata->lock); |
378 | return events ? IRQ_HANDLED : IRQ_NONE; | 377 | return events ? IRQ_HANDLED : IRQ_NONE; |
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c index 9ac2fa07dffa..ab56893aac73 100644 --- a/drivers/rtc/rtc-ds1553.c +++ b/drivers/rtc/rtc-ds1553.c | |||
@@ -206,8 +206,7 @@ static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id) | |||
206 | events |= RTC_UF; | 206 | events |= RTC_UF; |
207 | else | 207 | else |
208 | events |= RTC_AF; | 208 | events |= RTC_AF; |
209 | if (likely(pdata->rtc)) | 209 | rtc_update_irq(pdata->rtc, 1, events); |
210 | rtc_update_irq(pdata->rtc, 1, events); | ||
211 | } | 210 | } |
212 | spin_unlock(&pdata->lock); | 211 | spin_unlock(&pdata->lock); |
213 | return events ? IRQ_HANDLED : IRQ_NONE; | 212 | return events ? IRQ_HANDLED : IRQ_NONE; |
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c index a176ba614683..35ed49ea1f81 100644 --- a/drivers/rtc/rtc-stk17ta8.c +++ b/drivers/rtc/rtc-stk17ta8.c | |||
@@ -214,8 +214,7 @@ static irqreturn_t stk17ta8_rtc_interrupt(int irq, void *dev_id) | |||
214 | events |= RTC_UF; | 214 | events |= RTC_UF; |
215 | else | 215 | else |
216 | events |= RTC_AF; | 216 | events |= RTC_AF; |
217 | if (likely(pdata->rtc)) | 217 | rtc_update_irq(pdata->rtc, 1, events); |
218 | rtc_update_irq(pdata->rtc, 1, events); | ||
219 | } | 218 | } |
220 | spin_unlock(&pdata->lock); | 219 | spin_unlock(&pdata->lock); |
221 | return events ? IRQ_HANDLED : IRQ_NONE; | 220 | return events ? IRQ_HANDLED : IRQ_NONE; |
diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c index 4f87234e0dee..2e678c681b13 100644 --- a/drivers/rtc/rtc-tx4939.c +++ b/drivers/rtc/rtc-tx4939.c | |||
@@ -176,8 +176,8 @@ static irqreturn_t tx4939_rtc_interrupt(int irq, void *dev_id) | |||
176 | tx4939_rtc_cmd(rtcreg, TX4939_RTCCTL_COMMAND_NOP); | 176 | tx4939_rtc_cmd(rtcreg, TX4939_RTCCTL_COMMAND_NOP); |
177 | } | 177 | } |
178 | spin_unlock(&pdata->lock); | 178 | spin_unlock(&pdata->lock); |
179 | if (likely(pdata->rtc)) | 179 | rtc_update_irq(pdata->rtc, 1, events); |
180 | rtc_update_irq(pdata->rtc, 1, events); | 180 | |
181 | return IRQ_HANDLED; | 181 | return IRQ_HANDLED; |
182 | } | 182 | } |
183 | 183 | ||