GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-27 17:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

power: da9052-battery: Convert to the new da9052 interrupt functions

Browse source 
Convert to the new da9052 interrupt functions, so that we can get rid of
irq_base references.

Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Fabio Estevam 2012-10-04 00:15:08 -03:00 • committed by Samuel Ortiz
parent 21eed07d12
commit 4b5edf7887
1 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

44
drivers/power/da9052-battery.c
View file

@ -440,8 +440,10 @@ static int da9052_bat_check_health(struct da9052_battery *bat, int *health)
static irqreturn_t da9052_bat_irq(int irq, void *data) static irqreturn_t da9052_bat_irq(int irq, void *data)
{ {
struct da9052_battery *bat = data; struct da9052_battery *bat = data;
int virq;
irq -= bat->da9052->irq_base; virq = regmap_irq_get_virq(bat->da9052->irq_data, irq);
irq -= virq;
if (irq == DA9052_IRQ_CHGEND) if (irq == DA9052_IRQ_CHGEND)
bat->status = POWER_SUPPLY_STATUS_FULL; bat->status = POWER_SUPPLY_STATUS_FULL;
@ -567,7 +569,7 @@ static struct power_supply template_battery = {
.get_property = da9052_bat_get_property, .get_property = da9052_bat_get_property,
}; };
static const char *const da9052_bat_irqs[] = { static char *da9052_bat_irqs[] = {
"BATT TEMP", "BATT TEMP",
"DCIN DET", "DCIN DET",
"DCIN REM", "DCIN REM",
@ -576,12 +578,20 @@ static const char *const da9052_bat_irqs[] = {
"CHG END", "CHG END",
}; };
static int da9052_bat_irq_bits[] = {
DA9052_IRQ_TBAT,
DA9052_IRQ_DCIN,
DA9052_IRQ_DCINREM,
DA9052_IRQ_VBUS,
DA9052_IRQ_VBUSREM,
DA9052_IRQ_CHGEND,
};
static s32 __devinit da9052_bat_probe(struct platform_device *pdev) static s32 __devinit da9052_bat_probe(struct platform_device *pdev)
{ {
struct da9052_pdata *pdata; struct da9052_pdata *pdata;
struct da9052_battery *bat; struct da9052_battery *bat;
int ret; int ret;
int irq;
int i; int i;
bat = kzalloc(sizeof(struct da9052_battery), GFP_KERNEL); bat = kzalloc(sizeof(struct da9052_battery), GFP_KERNEL);
@ -602,15 +612,14 @@ static s32 __devinit da9052_bat_probe(struct platform_device *pdev)
bat->psy.use_for_apm = 1; bat->psy.use_for_apm = 1;
for (i = 0; i < ARRAY_SIZE(da9052_bat_irqs); i++) { for (i = 0; i < ARRAY_SIZE(da9052_bat_irqs); i++) {
irq = platform_get_irq_byname(pdev, da9052_bat_irqs[i]); ret = da9052_request_irq(bat->da9052,
ret = request_threaded_irq(bat->da9052->irq_base + irq, da9052_bat_irq_bits[i], da9052_bat_irqs[i],
NULL, da9052_bat_irq, da9052_bat_irq, bat);
IRQF_TRIGGER_LOW | IRQF_ONESHOT,
da9052_bat_irqs[i], bat);
if (ret != 0) { if (ret != 0) {
dev_err(bat->da9052->dev, dev_err(bat->da9052->dev,
"DA9052 failed to request %s IRQ %d: %d\n", "DA9052 failed to request %s IRQ: %d\n",
da9052_bat_irqs[i], irq, ret); da9052_bat_irqs[i], ret);
goto err; goto err;
} }
} }
@ -623,23 +632,20 @@ static s32 __devinit da9052_bat_probe(struct platform_device *pdev)
return 0; return 0;
err: err:
while (--i >= 0) { while (--i >= 0)
irq = platform_get_irq_byname(pdev, da9052_bat_irqs[i]); da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat);
free_irq(bat->da9052->irq_base + irq, bat);
}
kfree(bat); kfree(bat);
return ret; return ret;
} }
static int __devexit da9052_bat_remove(struct platform_device *pdev) static int __devexit da9052_bat_remove(struct platform_device *pdev)
{ {
int i; int i;
int irq;
struct da9052_battery *bat = platform_get_drvdata(pdev); struct da9052_battery *bat = platform_get_drvdata(pdev);
for (i = 0; i < ARRAY_SIZE(da9052_bat_irqs); i++) { for (i = 0; i < ARRAY_SIZE(da9052_bat_irqs); i++)
irq = platform_get_irq_byname(pdev, da9052_bat_irqs[i]); da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat);
free_irq(bat->da9052->irq_base + irq, bat);
}
power_supply_unregister(&bat->psy); power_supply_unregister(&bat->psy);
kfree(bat); kfree(bat);