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

extcon: int3496: Switch to devm_acpi_dev_add_driver_gpios()

Browse source 
Switch to use managed variant of acpi_dev_add_driver_gpios() to simplify
error path and fix potentially wrong assingment if ->probe() fails.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
This commit is contained in:
Andy Shevchenko 2017-06-10 22:09:21 +03:00 committed by Chanwoo Choi
parent a781a7d646
commit 1f4be24786
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/extcon/extcon-intel-int3496.c
View file

@ -94,8 +94,7 @@ static int int3496_probe(struct platform_device *pdev)
struct int3496_data *data; struct int3496_data *data;
int ret; int ret;
ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev), ret = devm_acpi_dev_add_driver_gpios(dev, acpi_int3496_default_gpios);
acpi_int3496_default_gpios);
if (ret) { if (ret) {
dev_err(dev, "can't add GPIO ACPI mapping\n"); dev_err(dev, "can't add GPIO ACPI mapping\n");
return ret; return ret;
@ -169,8 +168,6 @@ static int int3496_remove(struct platform_device *pdev)
devm_free_irq(&pdev->dev, data->usb_id_irq, data); devm_free_irq(&pdev->dev, data->usb_id_irq, data);
cancel_delayed_work_sync(&data->work); cancel_delayed_work_sync(&data->work);
acpi_dev_remove_driver_gpios(ACPI_COMPANION(&pdev->dev));
return 0; return 0;
} }