diff options
| author |   Alex Williamson <alex.williamson@redhat.com> | 2021-06-21 15:29:51 -0600 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2021-06-21 15:29:51 -0600 |
| commit | bc01b7617d46524a3e31cf73e4e1948a9b3b702b (patch) | |
| tree | 3dddad02fa1c7707ee30ce9edb2f571a1e9b654c /include/linux | |
| parent | vfio/platform: remove unneeded parent_module attribute (diff) | |
| parent | vfio/mbochs: Convert to use vfio_register_group_dev() (diff) | |
Merge branch 'hch-mdev-direct-v4' into v5.14/vfio/next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 2 | ||||
| -rw-r--r-- | include/linux/mdev.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index f1a00040fa53..d8b9c9e7d493 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -845,6 +845,8 @@ static inline void *dev_get_platdata(const struct device *dev) * Manual binding of a device to driver. See drivers/base/bus.c * for information on use. */ +int __must_check device_driver_attach(struct device_driver *drv, + struct device *dev); int __must_check device_bind_driver(struct device *dev); void device_release_driver(struct device *dev); int __must_check device_attach(struct device *dev); diff --git a/include/linux/mdev.h b/include/linux/mdev.h index 1fb34ea394ad..3a38598c2605 100644 --- a/include/linux/mdev.h +++ b/include/linux/mdev.h @@ -55,6 +55,7 @@ struct device *mtype_get_parent_dev(struct mdev_type *mtype); * register the device to mdev module. * * @owner: The module owner. + * @device_driver: Which device driver to probe() on newly created devices * @dev_attr_groups: Attributes of the parent device. * @mdev_attr_groups: Attributes of the mediated device. * @supported_type_groups: Attributes to define supported types. It is mandatory @@ -103,6 +104,7 @@ struct device *mtype_get_parent_dev(struct mdev_type *mtype); **/ struct mdev_parent_ops { struct module *owner; + struct mdev_driver *device_driver; const struct attribute_group **dev_attr_groups; const struct attribute_group **mdev_attr_groups; struct attribute_group **supported_type_groups; |