diff options
| author |   Todd Poynor <toddpoynor@google.com> | 2018-08-05 13:07:45 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-08 11:20:07 +0200 |
| commit | 565eeedaa0c1b2b0d8abd3845e349de29065a5d2 (patch) | |
| tree | 9d165a43bc75ba1793c01a5b8bace829c78ec5de /drivers/staging/gasket | |
| parent | staging: gasket: apex: fold device add/remove logic inline (diff) | |
| download | linux-dev-565eeedaa0c1b2b0d8abd3845e349de29065a5d2.tar.xz linux-dev-565eeedaa0c1b2b0d8abd3845e349de29065a5d2.zip | |
staging: gasket: core: remove sysfs setup and cleanup callbacks
Gasket device drivers now call into the gasket framework to initialize
and de-initialize, rather than the other way around. The calling code
can perform sysfs setup and cleanup actions without callbacks from the
framework. Remove the sysfs setup and cleanup callbacks.
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gasket')
| -rw-r--r-- | drivers/staging/gasket/gasket_core.c | 10 | ||||
| -rw-r--r-- | drivers/staging/gasket/gasket_core.h | 18 |
2 files changed, 0 insertions, 28 deletions
diff --git a/drivers/staging/gasket/gasket_core.c b/drivers/staging/gasket/gasket_core.c index 0d76e18fcde5..ace92f107ed5 100644 --- a/drivers/staging/gasket/gasket_core.c +++ b/drivers/staging/gasket/gasket_core.c @@ -1489,18 +1489,9 @@ int gasket_pci_add_device(struct pci_dev *pci_dev, if (ret) goto fail4; - ret = check_and_invoke_callback(gasket_dev, - driver_desc->sysfs_setup_cb); - if (ret) { - dev_err(gasket_dev->dev, "Error in sysfs setup cb: %d\n", ret); - goto fail5; - } - *gasket_devp = gasket_dev; return 0; -fail5: - check_and_invoke_callback(gasket_dev, driver_desc->sysfs_cleanup_cb); fail4: fail3: gasket_sysfs_remove_mapping(gasket_dev->dev_info.device); @@ -1550,7 +1541,6 @@ void gasket_pci_remove_device(struct pci_dev *pci_dev) gasket_cleanup_pci(gasket_dev); - check_and_invoke_callback(gasket_dev, driver_desc->sysfs_cleanup_cb); gasket_sysfs_remove_mapping(gasket_dev->dev_info.device); device_destroy(internal_desc->class, gasket_dev->dev_info.devt); gasket_free_dev(gasket_dev); diff --git a/drivers/staging/gasket/gasket_core.h b/drivers/staging/gasket/gasket_core.h index 0ef0a2640f0f..275fd0b345b6 100644 --- a/drivers/staging/gasket/gasket_core.h +++ b/drivers/staging/gasket/gasket_core.h @@ -445,24 +445,6 @@ struct gasket_driver_desc { int (*device_close_cb)(struct gasket_dev *dev); /* - * sysfs_setup_cb: Callback to set up driver-specific sysfs nodes. - * @dev: Pointer to the gasket_dev struct for this device. - * - * Called during the add gasket device call. - * - */ - int (*sysfs_setup_cb)(struct gasket_dev *dev); - - /* - * sysfs_cleanup_cb: Callback to clean up driver-specific sysfs nodes. - * @dev: Pointer to the gasket_dev struct for this device. - * - * Called during device disable processing. - * - */ - int (*sysfs_cleanup_cb)(struct gasket_dev *dev); - - /* * get_mappable_regions_cb: Get descriptors of mappable device memory. * @gasket_dev: Pointer to the struct gasket_dev for this device. * @bar_index: BAR for which to retrieve memory ranges. |