On 2020/11/26 下午10:49, Stefano Garzarella wrote:
Rename vdpasim_work() in vdpasim_net_work() and add it to the vdpasim_dev_attr structure. Co-developed-by: Max Gurtovoy <[email protected]> Signed-off-by: Max Gurtovoy <[email protected]> Signed-off-by: Stefano Garzarella <[email protected]> --- drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Acked-by: Jason Wang <[email protected]>
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c index 36677fc3631b..b84d9acd130c 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -60,6 +60,8 @@ struct vdpasim_dev_attr { u64 supported_features; int nvqs; u32 id; + + work_func_t work_fn; };/* State of each vdpasim device */@@ -153,7 +155,7 @@ static void vdpasim_reset(struct vdpasim *vdpasim) ++vdpasim->generation; }-static void vdpasim_work(struct work_struct *work)+static void vdpasim_net_work(struct work_struct *work) { struct vdpasim *vdpasim = container_of(work, struct vdpasim, work); @@ -360,7 +362,7 @@ static struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr) goto err_alloc;vdpasim->dev_attr = *dev_attr;- INIT_WORK(&vdpasim->work, vdpasim_work); + INIT_WORK(&vdpasim->work, dev_attr->work_fn); spin_lock_init(&vdpasim->lock); spin_lock_init(&vdpasim->iommu_lock);@@ -730,6 +732,7 @@ static int __init vdpasim_dev_init(void)dev_attr.id = VIRTIO_ID_NET; dev_attr.supported_features = VDPASIM_NET_FEATURES; dev_attr.nvqs = VDPASIM_VQ_NUM; + dev_attr.work_fn = vdpasim_net_work;vdpasim_dev = vdpasim_create(&dev_attr);
