Commit 09205a76 authored by Eric Farman's avatar Eric Farman Committed by Alex Williamson
Browse files

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: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarEric Farman <farman@linux.ibm.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarMatthew Rosato <mjrosato@linux.ibm.com>
Link: https://lore.kernel.org/r/20220707135737.720765-7-farman@linux.ibm.com


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 8557d73b

drivers/s390/cio/vfio_ccw_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/s390/cio/vfio_ccw_ops.c

+0 −10
Original line number Diff line number Diff line
@@ -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);

}

drivers/s390/cio/vfio_ccw_private.h

+0 −3
Original line number Diff line number Diff line
@@ -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;