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>

diff --git a/drivers/staging/gasket/gasket_core.c b/drivers/staging/gasket/gasket_core.c
index 0d76e18..ace92f1 100644 (file)
--- 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 0ef0a26..275fd0b 100644 (file)
--- a/drivers/staging/gasket/gasket_core.h
+++ b/drivers/staging/gasket/gasket_core.h
@@ -444,24 +444,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.