diff options
| author |   Eric Farman <farman@linux.ibm.com> | 2022-07-07 15:57:32 +0200 |
|---|---|---|
| committer |   Alex Williamson <alex.williamson@redhat.com> | 2022-07-07 14:06:12 -0600 |
| commit | 09205a7659714c14591c274fdbdfa97a20f4cef2 (patch) | |
| tree | 9ad16911f74ff4c105abe7ab15d029724d4eaf5e /drivers/s390/cio | |
| parent | vfio/ccw: Pass enum to FSM event jumptable (diff) | |
| download | linux-dev-09205a7659714c14591c274fdbdfa97a20f4cef2.tar.xz linux-dev-09205a7659714c14591c274fdbdfa97a20f4cef2.zip | |
vfio/ccw: Flatten MDEV device (un)register
The vfio_ccw_mdev_(un)reg routines are merely vfio-ccw routines that
pass control to mdev_(un)register_device. Since there's only one
caller of each, let's just call the mdev routines directly.
Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Link: https://lore.kernel.org/r/20220707135737.720765-7-farman@linux.ibm.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/s390/cio')
| -rw-r--r-- | drivers/s390/cio/vfio_ccw_drv.c | 4 | ||||
| -rw-r--r-- | drivers/s390/cio/vfio_ccw_ops.c | 10 | ||||
| -rw-r--r-- | drivers/s390/cio/vfio_ccw_private.h | 3 |
3 files changed, 2 insertions, 15 deletions
diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c index 279ad2161f17..fe87a2652a22 100644 --- a/drivers/s390/cio/vfio_ccw_drv.c +++ b/drivers/s390/cio/vfio_ccw_drv.c @@ -240,7 +240,7 @@ static int vfio_ccw_sch_probe(struct subchannel *sch) private->state = VFIO_CCW_STATE_STANDBY; - ret = vfio_ccw_mdev_reg(sch); + ret = mdev_register_device(&sch->dev, &vfio_ccw_mdev_driver); if (ret) goto out_disable; @@ -262,7 +262,7 @@ static void vfio_ccw_sch_remove(struct subchannel *sch) struct vfio_ccw_private *private = dev_get_drvdata(&sch->dev); vfio_ccw_sch_quiesce(sch); - vfio_ccw_mdev_unreg(sch); + mdev_unregister_device(&sch->dev); dev_set_drvdata(&sch->dev, NULL); diff --git a/drivers/s390/cio/vfio_ccw_ops.c b/drivers/s390/cio/vfio_ccw_ops.c index 81377270d4a7..a7ea9358e461 100644 --- a/drivers/s390/cio/vfio_ccw_ops.c +++ b/drivers/s390/cio/vfio_ccw_ops.c @@ -654,13 +654,3 @@ struct mdev_driver vfio_ccw_mdev_driver = { .remove = vfio_ccw_mdev_remove, .supported_type_groups = mdev_type_groups, }; - -int vfio_ccw_mdev_reg(struct subchannel *sch) -{ - return mdev_register_device(&sch->dev, &vfio_ccw_mdev_driver); -} - -void vfio_ccw_mdev_unreg(struct subchannel *sch) -{ - mdev_unregister_device(&sch->dev); -} diff --git a/drivers/s390/cio/vfio_ccw_private.h b/drivers/s390/cio/vfio_ccw_private.h index 5891bea8ce41..a2584c130e79 100644 --- a/drivers/s390/cio/vfio_ccw_private.h +++ b/drivers/s390/cio/vfio_ccw_private.h @@ -117,9 +117,6 @@ struct vfio_ccw_private { struct work_struct crw_work; } __aligned(8); -int vfio_ccw_mdev_reg(struct subchannel *sch); -void vfio_ccw_mdev_unreg(struct subchannel *sch); - int vfio_ccw_sch_quiesce(struct subchannel *sch); extern struct mdev_driver vfio_ccw_mdev_driver; |