Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 283092
b: refs/heads/master
c: 2d65943
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown authored and Linus Torvalds committed Jan 11, 2012
1 parent a17c1da commit 43914fd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dda367ac064d7473d397b1965019fb3be7cfb6b0
refs/heads/master: 2d65943e55bdd538640d0908bc9f3ead138b0431
20 changes: 0 additions & 20 deletions trunk/drivers/rtc/rtc-wm831x.c
Original file line number Diff line number Diff line change
Expand Up @@ -324,15 +324,6 @@ static irqreturn_t wm831x_alm_irq(int irq, void *data)
return IRQ_HANDLED;
}

static irqreturn_t wm831x_per_irq(int irq, void *data)
{
struct wm831x_rtc *wm831x_rtc = data;

rtc_update_irq(wm831x_rtc->rtc, 1, RTC_IRQF | RTC_UF);

return IRQ_HANDLED;
}

static const struct rtc_class_ops wm831x_rtc_ops = {
.read_time = wm831x_rtc_readtime,
.set_mmss = wm831x_rtc_set_mmss,
Expand Down Expand Up @@ -405,7 +396,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
{
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_rtc *wm831x_rtc;
int per_irq = platform_get_irq_byname(pdev, "PER");
int alm_irq = platform_get_irq_byname(pdev, "ALM");
int ret = 0;

Expand Down Expand Up @@ -433,14 +423,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
goto err;
}

ret = request_threaded_irq(per_irq, NULL, wm831x_per_irq,
IRQF_TRIGGER_RISING, "RTC period",
wm831x_rtc);
if (ret != 0) {
dev_err(&pdev->dev, "Failed to request periodic IRQ %d: %d\n",
per_irq, ret);
}

ret = request_threaded_irq(alm_irq, NULL, wm831x_alm_irq,
IRQF_TRIGGER_RISING, "RTC alarm",
wm831x_rtc);
Expand All @@ -459,11 +441,9 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
static int __devexit wm831x_rtc_remove(struct platform_device *pdev)
{
struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev);
int per_irq = platform_get_irq_byname(pdev, "PER");
int alm_irq = platform_get_irq_byname(pdev, "ALM");

free_irq(alm_irq, wm831x_rtc);
free_irq(per_irq, wm831x_rtc);
rtc_device_unregister(wm831x_rtc->rtc);
kfree(wm831x_rtc);

Expand Down

0 comments on commit 43914fd

Please sign in to comment.