drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler
Due to changes in the RTC core the period interrupt is now unused so delete the code managing it. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> 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>
This commit is contained in:
parent
dda367ac06
commit
2d65943e55
|
@ -324,15 +324,6 @@ static irqreturn_t wm831x_alm_irq(int irq, void *data)
|
||||||
return IRQ_HANDLED;
|
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 = {
|
static const struct rtc_class_ops wm831x_rtc_ops = {
|
||||||
.read_time = wm831x_rtc_readtime,
|
.read_time = wm831x_rtc_readtime,
|
||||||
.set_mmss = wm831x_rtc_set_mmss,
|
.set_mmss = wm831x_rtc_set_mmss,
|
||||||
|
@ -405,7 +396,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
|
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
|
||||||
struct wm831x_rtc *wm831x_rtc;
|
struct wm831x_rtc *wm831x_rtc;
|
||||||
int per_irq = platform_get_irq_byname(pdev, "PER");
|
|
||||||
int alm_irq = platform_get_irq_byname(pdev, "ALM");
|
int alm_irq = platform_get_irq_byname(pdev, "ALM");
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -433,14 +423,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
|
||||||
goto err;
|
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,
|
ret = request_threaded_irq(alm_irq, NULL, wm831x_alm_irq,
|
||||||
IRQF_TRIGGER_RISING, "RTC alarm",
|
IRQF_TRIGGER_RISING, "RTC alarm",
|
||||||
wm831x_rtc);
|
wm831x_rtc);
|
||||||
|
@ -459,11 +441,9 @@ err:
|
||||||
static int __devexit wm831x_rtc_remove(struct platform_device *pdev)
|
static int __devexit wm831x_rtc_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(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");
|
int alm_irq = platform_get_irq_byname(pdev, "ALM");
|
||||||
|
|
||||||
free_irq(alm_irq, wm831x_rtc);
|
free_irq(alm_irq, wm831x_rtc);
|
||||||
free_irq(per_irq, wm831x_rtc);
|
|
||||||
rtc_device_unregister(wm831x_rtc->rtc);
|
rtc_device_unregister(wm831x_rtc->rtc);
|
||||||
kfree(wm831x_rtc);
|
kfree(wm831x_rtc);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue