microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

power: supply: axp288_charger: Simplify extcon cable handling 

Simplify extcon cable handling using the new
devm_extcon_register_notifier_all function to listen to all cables
in one go.

Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
This commit is contained in:
Hans de Goede 2017-12-26 13:59:08 +01:00 коммит произвёл Sebastian Reichel
Родитель 81d56dd3d5
Коммит 8c0a0a2959
1 изменённых файлов: 10 добавлений и 41 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

51
drivers/power/supply/axp288_charger.c
Просмотреть файл

@ -103,9 +103,6 @@
#define USB_HOST_EXTCON_HID "INT3496" #define USB_HOST_EXTCON_HID "INT3496"
#define USB_HOST_EXTCON_NAME "INT3496:00" #define USB_HOST_EXTCON_NAME "INT3496:00"
static const unsigned int cable_ids[] =
{ EXTCON_CHG_USB_SDP, EXTCON_CHG_USB_CDP, EXTCON_CHG_USB_DCP };
enum { enum {
VBUS_OV_IRQ = 0, VBUS_OV_IRQ = 0,
CHARGE_DONE_IRQ, CHARGE_DONE_IRQ,
@ -137,7 +134,7 @@ struct axp288_chrg_info {
/* SDP/CDP/DCP USB charging cable notifications */ /* SDP/CDP/DCP USB charging cable notifications */
struct { struct {
struct extcon_dev *edev; struct extcon_dev *edev;
struct notifier_block nb[ARRAY_SIZE(cable_ids)]; struct notifier_block nb;
struct work_struct work; struct work_struct work;
} cable; } cable;
@ -595,34 +592,11 @@ static void axp288_charger_extcon_evt_worker(struct work_struct *work)
power_supply_changed(info->psy_usb); power_supply_changed(info->psy_usb);
} }
/* static int axp288_charger_handle_cable_evt(struct notifier_block *nb,
* We need 3 copies of this, because there is no way to find out for which unsigned long event, void *param)
* cable id we are being called from the passed in arguments; and we must
* have a separate nb for each extcon_register_notifier call.
*/
static int axp288_charger_handle_cable0_evt(struct notifier_block *nb,
unsigned long event, void *param)
{ {
struct axp288_chrg_info *info = struct axp288_chrg_info *info =
container_of(nb, struct axp288_chrg_info, cable.nb[0]); container_of(nb, struct axp288_chrg_info, cable.nb);
schedule_work(&info->cable.work);
return NOTIFY_OK;
}
static int axp288_charger_handle_cable1_evt(struct notifier_block *nb,
unsigned long event, void *param)
{
struct axp288_chrg_info *info =
container_of(nb, struct axp288_chrg_info, cable.nb[1]);
schedule_work(&info->cable.work);
return NOTIFY_OK;
}
static int axp288_charger_handle_cable2_evt(struct notifier_block *nb,
unsigned long event, void *param)
{
struct axp288_chrg_info *info =
container_of(nb, struct axp288_chrg_info, cable.nb[2]);
schedule_work(&info->cable.work); schedule_work(&info->cable.work);
return NOTIFY_OK; return NOTIFY_OK;
} }
@ -800,17 +774,12 @@ static int axp288_charger_probe(struct platform_device *pdev)
/* Register for extcon notification */ /* Register for extcon notification */
INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker); INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);
info->cable.nb[0].notifier_call = axp288_charger_handle_cable0_evt; info->cable.nb.notifier_call = axp288_charger_handle_cable_evt;
info->cable.nb[1].notifier_call = axp288_charger_handle_cable1_evt; ret = devm_extcon_register_notifier_all(dev, info->cable.edev,
info->cable.nb[2].notifier_call = axp288_charger_handle_cable2_evt; &info->cable.nb);
for (i = 0; i < ARRAY_SIZE(cable_ids); i++) { if (ret) {
ret = devm_extcon_register_notifier(dev, info->cable.edev, dev_err(dev, "failed to register cable extcon notifier\n");
cable_ids[i], &info->cable.nb[i]); return ret;
if (ret) {
dev_err(dev, "failed to register extcon notifier for %u: %d\n",
cable_ids[i], ret);
return ret;
}
} }
schedule_work(&info->cable.work); schedule_work(&info->cable.work);