diff options
| author | Todd Poynor | 2018-08-05 22:07:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-08-08 11:20:07 +0200 |
| commit | 4420ea9366a5df61cbb0bb2ad827ff6391904f56 (patch) | |
| tree | 110d25d42c1eb4c6d681f006fe70169cbdd02d68 /drivers/staging/gasket/gasket_core.c | |
| parent | staging: gasket: apex: enable/disable gasket device from apex (diff) | |
| download | kernel-qcow2-linux-4420ea9366a5df61cbb0bb2ad827ff6391904f56.tar.gz kernel-qcow2-linux-4420ea9366a5df61cbb0bb2ad827ff6391904f56.tar.xz kernel-qcow2-linux-4420ea9366a5df61cbb0bb2ad827ff6391904f56.zip | |
staging: gasket: core: delete device add and remove callbacks
Gasket device drivers are now in charge of orchestrating the device add
and removal sequences, so the callbacks from the framework to the device
drivers for these events are no longer needed.
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gasket/gasket_core.c')
| -rw-r--r-- | drivers/staging/gasket/gasket_core.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/gasket/gasket_core.c b/drivers/staging/gasket/gasket_core.c index fad4883e6332..0d76e18fcde5 100644 --- a/drivers/staging/gasket/gasket_core.c +++ b/drivers/staging/gasket/gasket_core.c @@ -1468,12 +1468,6 @@ int gasket_pci_add_device(struct pci_dev *pci_dev, if (ret) goto fail2; - ret = check_and_invoke_callback(gasket_dev, driver_desc->add_dev_cb); - if (ret) { - dev_err(gasket_dev->dev, "Error in add device cb: %d\n", ret); - goto fail2; - } - ret = gasket_sysfs_create_mapping(gasket_dev->dev_info.device, gasket_dev); if (ret) @@ -1512,7 +1506,6 @@ fail3: gasket_sysfs_remove_mapping(gasket_dev->dev_info.device); fail2: gasket_cleanup_pci(gasket_dev); - check_and_invoke_callback(gasket_dev, driver_desc->remove_dev_cb); device_destroy(internal_desc->class, gasket_dev->dev_info.devt); fail1: gasket_free_dev(gasket_dev); @@ -1559,9 +1552,6 @@ void gasket_pci_remove_device(struct pci_dev *pci_dev) check_and_invoke_callback(gasket_dev, driver_desc->sysfs_cleanup_cb); gasket_sysfs_remove_mapping(gasket_dev->dev_info.device); - - check_and_invoke_callback(gasket_dev, driver_desc->remove_dev_cb); - device_destroy(internal_desc->class, gasket_dev->dev_info.devt); gasket_free_dev(gasket_dev); } |