|
@@ -762,8 +762,7 @@ static int bcm_acpi_probe(struct bcm_device *dev)
|
|
if (id)
|
|
if (id)
|
|
gpio_mapping = (const struct acpi_gpio_mapping *) id->driver_data;
|
|
gpio_mapping = (const struct acpi_gpio_mapping *) id->driver_data;
|
|
|
|
|
|
- ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(&pdev->dev),
|
|
|
|
- gpio_mapping);
|
|
|
|
|
|
+ ret = devm_acpi_dev_add_driver_gpios(&pdev->dev, gpio_mapping);
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
@@ -834,8 +833,6 @@ static int bcm_remove(struct platform_device *pdev)
|
|
list_del(&dev->list);
|
|
list_del(&dev->list);
|
|
mutex_unlock(&bcm_device_lock);
|
|
mutex_unlock(&bcm_device_lock);
|
|
|
|
|
|
- acpi_dev_remove_driver_gpios(ACPI_COMPANION(&pdev->dev));
|
|
|
|
-
|
|
|
|
dev_info(&pdev->dev, "%s device unregistered.\n", dev->name);
|
|
dev_info(&pdev->dev, "%s device unregistered.\n", dev->name);
|
|
|
|
|
|
return 0;
|
|
return 0;
|