Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

power: bq24190_charger: install irq_handler_thread() at end of probe() #2

Merged
merged 6 commits into from
Oct 6, 2016
Merged

power: bq24190_charger: install irq_handler_thread() at end of probe() #2

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
81aef9f
power: bq24190_charger: enable gpio to assert charger otg pin
networkimprov Sep 22, 2016
18ca99a
power: bq24190_charger: install irq_handler_thread() at end of probe()
networkimprov Sep 24, 2016
fc8a1c7
power: bq24190_charger: install irq_handler_thread() with IRQF_TRIGGE…
networkimprov Sep 25, 2016
616c3d0
power: bq24190_charger: rename gpio for charger otg pin
networkimprov Oct 4, 2016
3d7ce26
power: bq24190_charger: fix check of gpio for charger otg pin
networkimprov Oct 5, 2016
463b106
REVERT: power: bq24190_charger: enable gpio to assert charger otg pin
networkimprov Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions drivers/power/bq24190_charger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,22 +1366,13 @@ static int bq24190_probe(struct i2c_client *client,
return -EINVAL;
}

ret = devm_request_threaded_irq(dev, bdi->irq, NULL,
bq24190_irq_handler_thread,
IRQF_TRIGGER_RISING | IRQF_ONESHOT,
"bq24190-charger", bdi);
if (ret < 0) {
dev_err(dev, "Can't set up irq handler\n");
goto out1;
}

pm_runtime_enable(dev);
pm_runtime_resume(dev);

ret = bq24190_hw_init(bdi);
if (ret < 0) {
dev_err(dev, "Hardware init failed\n");
goto out2;
goto out1;
}

charger_cfg.drv_data = bdi;
Expand All @@ -1392,7 +1383,7 @@ static int bq24190_probe(struct i2c_client *client,
if (IS_ERR(bdi->charger)) {
dev_err(dev, "Can't register charger\n");
ret = PTR_ERR(bdi->charger);
goto out2;
goto out1;
}

battery_cfg.drv_data = bdi;
Expand All @@ -1401,24 +1392,34 @@ static int bq24190_probe(struct i2c_client *client,
if (IS_ERR(bdi->battery)) {
dev_err(dev, "Can't register battery\n");
ret = PTR_ERR(bdi->battery);
goto out3;
goto out2;
}

ret = bq24190_sysfs_create_group(bdi);
if (ret) {
dev_err(dev, "Can't create sysfs entries\n");
goto out3;
}

ret = devm_request_threaded_irq(dev, bdi->irq, NULL,
bq24190_irq_handler_thread,
IRQF_TRIGGER_RISING | IRQF_ONESHOT,
"bq24190-charger", bdi);
if (ret < 0) {
dev_err(dev, "Can't set up irq handler\n");
goto out4;
}

return 0;

out4:
power_supply_unregister(bdi->battery);
bq24190_sysfs_remove_group(bdi);
out3:
power_supply_unregister(bdi->charger);
power_supply_unregister(bdi->battery);
out2:
pm_runtime_disable(dev);
power_supply_unregister(bdi->charger);
out1:
pm_runtime_disable(dev);
if (bdi->gpio_int)
gpio_free(bdi->gpio_int);

Expand Down