Add drv_to_virtio wrapper to get virtio_driver from device_driver.
Cc: Rusty Russell ru...@rustcorp.com.au
Cc: Michael S. Tsirkin m...@redhat.com
Signed-off-by: Wanlong Gao gaowanl...@cn.fujitsu.com
---
drivers/virtio/virtio.c | 11 ---
include/linux/virtio.h | 5 +
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 1346ae8..1c01ac3 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -73,7 +73,7 @@ static int virtio_dev_match(struct device *_dv, struct
device_driver *_dr)
struct virtio_device *dev = dev_to_virtio(_dv);
const struct virtio_device_id *ids;
- ids = container_of(_dr, struct virtio_driver, driver)-id_table;
+ ids = drv_to_virtio(_dr)-id_table;
for (i = 0; ids[i].device; i++)
if (virtio_id_match(dev, ids[i]))
return 1;
@@ -97,8 +97,7 @@ void virtio_check_driver_offered_feature(const struct
virtio_device *vdev,
unsigned int fbit)
{
unsigned int i;
- struct virtio_driver *drv = container_of(vdev-dev.driver,
-struct virtio_driver, driver);
+ struct virtio_driver *drv = drv_to_virtio(vdev-dev.driver);
for (i = 0; i drv-feature_table_size; i++)
if (drv-feature_table[i] == fbit)
@@ -111,8 +110,7 @@ static int virtio_dev_probe(struct device *_d)
{
int err, i;
struct virtio_device *dev = dev_to_virtio(_d);
- struct virtio_driver *drv = container_of(dev-dev.driver,
-struct virtio_driver, driver);
+ struct virtio_driver *drv = drv_to_virtio(dev-dev.driver);
u32 device_features;
/* We have a driver! */
@@ -152,8 +150,7 @@ static int virtio_dev_probe(struct device *_d)
static int virtio_dev_remove(struct device *_d)
{
struct virtio_device *dev = dev_to_virtio(_d);
- struct virtio_driver *drv = container_of(dev-dev.driver,
-struct virtio_driver, driver);
+ struct virtio_driver *drv = drv_to_virtio(dev-dev.driver);
drv-remove(dev);
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 95b4463..6f8f27d 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -113,6 +113,11 @@ struct virtio_driver {
#endif
};
+static inline struct virtio_driver *drv_to_virtio(struct device_driver *drv)
+{
+ return container_of(drv, struct virtio_driver, driver);
+}
+
int register_virtio_driver(struct virtio_driver *drv);
void unregister_virtio_driver(struct virtio_driver *drv);
#endif /* _LINUX_VIRTIO_H */
--
1.8.0
___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
