Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

[firefly-linux-kernel-4.4.55.git] / drivers / vfio / platform / vfio_platform_private.h

diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h
index 415310f62b06cc4a8a76153c15b00b45e7c09279..42816dd280cb98ac4e27fabced74c2d9aa1df3d7 100644 (file)
--- a/drivers/vfio/platform/vfio_platform_private.h
+++ b/drivers/vfio/platform/vfio_platform_private.h
@@ -58,6 +58,8 @@ struct vfio_platform_device {
        struct mutex                    igate;
        struct module                   *parent_module;
        const char                      *compat;
+       struct module                   *reset_module;
+       struct device                   *device;
 
        /*
         * These fields should be filled by the bus specific binder
@@ -81,12 +83,6 @@ struct vfio_platform_reset_node {
        vfio_platform_reset_fn_t reset;
 };
 
-struct vfio_platform_reset_combo {
-       const char *compat;
-       const char *reset_function_name;
-       const char *module_name;
-};
-
 extern int vfio_platform_probe_common(struct vfio_platform_device *vdev,
                                      struct device *dev);
 extern struct vfio_platform_device *vfio_platform_remove_common