Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 16:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

HID: hid-sony.c: Use devm_ api to simplify sony_battery_probe()

Browse Source 
HID: hid-sony.c: Use devm_ api to simplify sony_battery_probe()

Using devm_ calls, the resources of the Sony game devices's features are
tied to the main device handle, making it easier to handle errors and
teardown inside the device driver. Altogether, this reduces complexity
of the driver source.

Signed-off-by: Hanno Zulla <kontakt@hanno.de>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Hanno Zulla 2018-06-14 16:31:36 +02:00 committed by Jiri Kosina
parent f2d98e2c02
commit 8082d3f022
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/hid/hid-sony.c
View File

@ -2318,36 +2318,21 @@ static int sony_battery_probe(struct sony_sc *sc, int append_dev_id)
sc->battery_desc.get_property = sony_battery_get_property; sc->battery_desc.get_property = sony_battery_get_property;
sc->battery_desc.type = POWER_SUPPLY_TYPE_BATTERY; sc->battery_desc.type = POWER_SUPPLY_TYPE_BATTERY;
sc->battery_desc.use_for_apm = 0; sc->battery_desc.use_for_apm = 0;
sc->battery_desc.name = kasprintf(GFP_KERNEL, battery_str_fmt, sc->battery_desc.name = devm_kasprintf(&hdev->dev, GFP_KERNEL,
sc->mac_address, sc->device_id); battery_str_fmt, sc->mac_address, sc->device_id);
if (!sc->battery_desc.name) if (!sc->battery_desc.name)
return -ENOMEM; return -ENOMEM;
sc->battery = power_supply_register(&hdev->dev, &sc->battery_desc, sc->battery = devm_power_supply_register(&hdev->dev, &sc->battery_desc,
&psy_cfg); &psy_cfg);
if (IS_ERR(sc->battery)) { if (IS_ERR(sc->battery)) {
ret = PTR_ERR(sc->battery); ret = PTR_ERR(sc->battery);
hid_err(hdev, "Unable to register battery device\n"); hid_err(hdev, "Unable to register battery device\n");
goto err_free; return ret;
} }
power_supply_powers(sc->battery, &hdev->dev); power_supply_powers(sc->battery, &hdev->dev);
return 0; return 0;
err_free:
kfree(sc->battery_desc.name);
sc->battery_desc.name = NULL;
return ret;
}
static void sony_battery_remove(struct sony_sc *sc)
{
if (!sc->battery_desc.name)
return;
power_supply_unregister(sc->battery);
kfree(sc->battery_desc.name);
sc->battery_desc.name = NULL;
} }
/* /*
@ -2805,8 +2790,6 @@ err_stop:
device_remove_file(&sc->hdev->dev, &dev_attr_firmware_version); device_remove_file(&sc->hdev->dev, &dev_attr_firmware_version);
if (sc->hw_version) if (sc->hw_version)
device_remove_file(&sc->hdev->dev, &dev_attr_hardware_version); device_remove_file(&sc->hdev->dev, &dev_attr_hardware_version);
if (sc->quirks & SONY_BATTERY_SUPPORT)
sony_battery_remove(sc);
sony_cancel_work_sync(sc); sony_cancel_work_sync(sc);
kfree(sc->output_report_dmabuf); kfree(sc->output_report_dmabuf);
sony_remove_dev_list(sc); sony_remove_dev_list(sc);
@ -2885,9 +2868,6 @@ static void sony_remove(struct hid_device *hdev)
hid_hw_close(hdev); hid_hw_close(hdev);
if (sc->quirks & SONY_BATTERY_SUPPORT)
sony_battery_remove(sc);
if (sc->quirks & DUALSHOCK4_CONTROLLER_BT) if (sc->quirks & DUALSHOCK4_CONTROLLER_BT)
device_remove_file(&sc->hdev->dev, &dev_attr_bt_poll_interval); device_remove_file(&sc->hdev->dev, &dev_attr_bt_poll_interval);