diff options
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-wm831x.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c index bdc909bd56da..dabbd456dfe1 100644 --- a/drivers/rtc/rtc-wm831x.c +++ b/drivers/rtc/rtc-wm831x.c | |||
| @@ -324,15 +324,6 @@ static irqreturn_t wm831x_alm_irq(int irq, void *data) | |||
| 324 | return IRQ_HANDLED; | 324 | return IRQ_HANDLED; |
| 325 | } | 325 | } |
| 326 | 326 | ||
| 327 | static irqreturn_t wm831x_per_irq(int irq, void *data) | ||
| 328 | { | ||
| 329 | struct wm831x_rtc *wm831x_rtc = data; | ||
| 330 | |||
| 331 | rtc_update_irq(wm831x_rtc->rtc, 1, RTC_IRQF | RTC_UF); | ||
| 332 | |||
| 333 | return IRQ_HANDLED; | ||
| 334 | } | ||
| 335 | |||
| 336 | static const struct rtc_class_ops wm831x_rtc_ops = { | 327 | static const struct rtc_class_ops wm831x_rtc_ops = { |
| 337 | .read_time = wm831x_rtc_readtime, | 328 | .read_time = wm831x_rtc_readtime, |
| 338 | .set_mmss = wm831x_rtc_set_mmss, | 329 | .set_mmss = wm831x_rtc_set_mmss, |
| @@ -405,7 +396,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev) | |||
| 405 | { | 396 | { |
| 406 | struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); | 397 | struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); |
| 407 | struct wm831x_rtc *wm831x_rtc; | 398 | struct wm831x_rtc *wm831x_rtc; |
| 408 | int per_irq = platform_get_irq_byname(pdev, "PER"); | ||
| 409 | int alm_irq = platform_get_irq_byname(pdev, "ALM"); | 399 | int alm_irq = platform_get_irq_byname(pdev, "ALM"); |
| 410 | int ret = 0; | 400 | int ret = 0; |
| 411 | 401 | ||
| @@ -433,14 +423,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev) | |||
| 433 | goto err; | 423 | goto err; |
| 434 | } | 424 | } |
| 435 | 425 | ||
| 436 | ret = request_threaded_irq(per_irq, NULL, wm831x_per_irq, | ||
| 437 | IRQF_TRIGGER_RISING, "RTC period", | ||
| 438 | wm831x_rtc); | ||
| 439 | if (ret != 0) { | ||
| 440 | dev_err(&pdev->dev, "Failed to request periodic IRQ %d: %d\n", | ||
| 441 | per_irq, ret); | ||
| 442 | } | ||
| 443 | |||
| 444 | ret = request_threaded_irq(alm_irq, NULL, wm831x_alm_irq, | 426 | ret = request_threaded_irq(alm_irq, NULL, wm831x_alm_irq, |
| 445 | IRQF_TRIGGER_RISING, "RTC alarm", | 427 | IRQF_TRIGGER_RISING, "RTC alarm", |
| 446 | wm831x_rtc); | 428 | wm831x_rtc); |
| @@ -459,11 +441,9 @@ err: | |||
| 459 | static int __devexit wm831x_rtc_remove(struct platform_device *pdev) | 441 | static int __devexit wm831x_rtc_remove(struct platform_device *pdev) |
| 460 | { | 442 | { |
| 461 | struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev); | 443 | struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev); |
| 462 | int per_irq = platform_get_irq_byname(pdev, "PER"); | ||
| 463 | int alm_irq = platform_get_irq_byname(pdev, "ALM"); | 444 | int alm_irq = platform_get_irq_byname(pdev, "ALM"); |
| 464 | 445 | ||
| 465 | free_irq(alm_irq, wm831x_rtc); | 446 | free_irq(alm_irq, wm831x_rtc); |
| 466 | free_irq(per_irq, wm831x_rtc); | ||
| 467 | rtc_device_unregister(wm831x_rtc->rtc); | 447 | rtc_device_unregister(wm831x_rtc->rtc); |
| 468 | kfree(wm831x_rtc); | 448 | kfree(wm831x_rtc); |
| 469 | 449 | ||
