1 files changed, 16 insertions, 2 deletions

diff --git a/include/linux/host1x.h b/include/linux/host1x.h
index bb9840fd1e18..464f33814a94 100644
--- a/include/linux/host1x.h
+++ b/include/linux/host1x.h
@@ -250,17 +250,29 @@ void host1x_job_unpin(struct host1x_job *job);
 struct host1x_device;
 
 struct host1x_driver {
+        struct device_driver driver;
+
         const struct of_device_id *subdevs;
         struct list_head list;
-        const char *name;
 
         int (*probe)(struct host1x_device *device);
         int (*remove)(struct host1x_device *device);
+        void (*shutdown)(struct host1x_device *device);
 };
 
-int host1x_driver_register(struct host1x_driver *driver);
+static inline struct host1x_driver *
+to_host1x_driver(struct device_driver *driver)
+{
+        return container_of(driver, struct host1x_driver, driver);
+}
+
+int host1x_driver_register_full(struct host1x_driver *driver,
+                                struct module *owner);
 void host1x_driver_unregister(struct host1x_driver *driver);
 
+#define host1x_driver_register(driver) \
+        host1x_driver_register_full(driver, THIS_MODULE)
+
 struct host1x_device {
         struct host1x_driver *driver;
         struct list_head list;
@@ -272,6 +284,8 @@ struct host1x_device {
 
         struct mutex clients_lock;
         struct list_head clients;
+
+        bool registered;
 };
 
 static inline struct host1x_device *to_host1x_device(struct device *dev)