Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wm831x_power: Use genirq

Browse source 
Since the WM831x core has been converted to use genirq for the
interrupt controller there is no longer any need for chip specific
wrappers for IRQ operations. Convert to use genirq directly.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
This commit is contained in:
Mark Brown 2010-03-10 18:27:40 +00:00 committed by Anton Vorontsov
parent e3e8d1c93f
commit b5874f33bb
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/power/wm831x_power.c
View file

@ -536,9 +536,9 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
goto err_battery; goto err_battery;
irq = platform_get_irq_byname(pdev, "SYSLO"); irq = platform_get_irq_byname(pdev, "SYSLO");
ret = wm831x_request_irq(wm831x, irq, wm831x_syslo_irq, ret = request_threaded_irq(irq, NULL, wm831x_syslo_irq,
IRQF_TRIGGER_RISING, "SYSLO", IRQF_TRIGGER_RISING, "System power low",
power); power);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, "Failed to request SYSLO IRQ %d: %d\n", dev_err(&pdev->dev, "Failed to request SYSLO IRQ %d: %d\n",
irq, ret); irq, ret);
@ -546,9 +546,9 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
} }
irq = platform_get_irq_byname(pdev, "PWR SRC"); irq = platform_get_irq_byname(pdev, "PWR SRC");
ret = wm831x_request_irq(wm831x, irq, wm831x_pwr_src_irq, ret = request_threaded_irq(irq, NULL, wm831x_pwr_src_irq,
IRQF_TRIGGER_RISING, "Power source", IRQF_TRIGGER_RISING, "Power source",
power); power);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, "Failed to request PWR SRC IRQ %d: %d\n", dev_err(&pdev->dev, "Failed to request PWR SRC IRQ %d: %d\n",
irq, ret); irq, ret);
@ -557,10 +557,10 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) { for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) {
irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]); irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]);
ret = wm831x_request_irq(wm831x, irq, wm831x_bat_irq, ret = request_threaded_irq(irq, NULL, wm831x_bat_irq,
IRQF_TRIGGER_RISING, IRQF_TRIGGER_RISING,
wm831x_bat_irqs[i], wm831x_bat_irqs[i],
power); power);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Failed to request %s IRQ %d: %d\n", "Failed to request %s IRQ %d: %d\n",
@ -574,13 +574,13 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
err_bat_irq: err_bat_irq:
for (; i >= 0; i--) { for (; i >= 0; i--) {
irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]); irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]);
wm831x_free_irq(wm831x, irq, power); free_irq(irq, power);
} }
irq = platform_get_irq_byname(pdev, "PWR SRC"); irq = platform_get_irq_byname(pdev, "PWR SRC");
wm831x_free_irq(wm831x, irq, power); free_irq(irq, power);
err_syslo: err_syslo:
irq = platform_get_irq_byname(pdev, "SYSLO"); irq = platform_get_irq_byname(pdev, "SYSLO");
wm831x_free_irq(wm831x, irq, power); free_irq(irq, power);
err_usb: err_usb:
power_supply_unregister(usb); power_supply_unregister(usb);
err_battery: err_battery:
@ -595,19 +595,18 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
static __devexit int wm831x_power_remove(struct platform_device *pdev) static __devexit int wm831x_power_remove(struct platform_device *pdev)
{ {
struct wm831x_power *wm831x_power = platform_get_drvdata(pdev); struct wm831x_power *wm831x_power = platform_get_drvdata(pdev);
struct wm831x *wm831x = wm831x_power->wm831x;
int irq, i; int irq, i;
for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) { for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) {
irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]); irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]);
wm831x_free_irq(wm831x, irq, wm831x_power); free_irq(irq, wm831x_power);
} }
irq = platform_get_irq_byname(pdev, "PWR SRC"); irq = platform_get_irq_byname(pdev, "PWR SRC");
wm831x_free_irq(wm831x, irq, wm831x_power); free_irq(irq, wm831x_power);
irq = platform_get_irq_byname(pdev, "SYSLO"); irq = platform_get_irq_byname(pdev, "SYSLO");
wm831x_free_irq(wm831x, irq, wm831x_power); free_irq(irq, wm831x_power);
power_supply_unregister(&wm831x_power->battery); power_supply_unregister(&wm831x_power->battery);
power_supply_unregister(&wm831x_power->wall); power_supply_unregister(&wm831x_power->wall);