Merge branch 'clk-ti' into clk-next

[linux.git] / include / linux / remoteproc.h

diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 507a2b5242085f458da932f955020f9a53567267..04d04709f2bda8d5edf65cbdf8ca56ee7fc00ac5 100644 (file)
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -345,9 +345,9 @@ struct firmware;
  * @stop:      power off the device
  * @kick:      kick a virtqueue (virtqueue id given as a parameter)
  * @da_to_va:  optional platform hook to perform address translations
- * @load_rsc_table:    load resource table from firmware image
+ * @parse_fw:  parse firmware to extract information (e.g. resource table)
  * @find_loaded_rsc_table: find the loaded resouce table
- * @load:              load firmeware to memory, where the remote processor
+ * @load:              load firmware to memory, where the remote processor
  *                     expects to find it
  * @sanity_check:      sanity check the fw image
  * @get_boot_addr:     get boot address to entry point specified in firmware
@@ -554,11 +554,11 @@ struct rproc_vdev {
        struct kref refcount;
 
        struct rproc_subdev subdev;
+       struct device dev;
 
        unsigned int id;
        struct list_head node;
        struct rproc *rproc;
-       struct virtio_device vdev;
        struct rproc_vring vring[RVDEV_NUM_VRINGS];
        u32 rsc_offset;
        u32 index;
@@ -601,7 +601,7 @@ int rproc_coredump_add_custom_segment(struct rproc *rproc,
 
 static inline struct rproc_vdev *vdev_to_rvdev(struct virtio_device *vdev)
 {
-       return container_of(vdev, struct rproc_vdev, vdev);
+       return container_of(vdev->dev.parent, struct rproc_vdev, dev);
 }
 
 static inline struct rproc *vdev_to_rproc(struct virtio_device *vdev)