Commit 31aae32c authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Vasily Gorbik
Browse files

s390/vfio-ap: clean up vfio_ap_drv's definition 



Define & initialize the driver struct in one go, so that everything
is in one place.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 0677519a

drivers/s390/crypto/vfio_ap_drv.c

+6 −7
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ MODULE_AUTHOR("IBM Corporation"); 
MODULE_DESCRIPTION("VFIO AP device driver, Copyright IBM Corp. 2018");

MODULE_LICENSE("GPL v2");



static struct ap_driver vfio_ap_drv;



struct ap_matrix_dev *matrix_dev;



/* Only type 10 adapters (CEX4 and later) are supported
@@ -80,6 +78,12 @@ static void vfio_ap_queue_dev_remove(struct ap_device *apdev) 
	mutex_unlock(&matrix_dev->lock);

}



static struct ap_driver vfio_ap_drv = {

	.probe = vfio_ap_queue_dev_probe,

	.remove = vfio_ap_queue_dev_remove,

	.ids = ap_queue_ids,

};



static void vfio_ap_matrix_dev_release(struct device *dev)

{

	struct ap_matrix_dev *matrix_dev = dev_get_drvdata(dev);
@@ -181,11 +185,6 @@ static int __init vfio_ap_init(void) 
	if (ret)

		return ret;



	memset(&vfio_ap_drv, 0, sizeof(vfio_ap_drv));

	vfio_ap_drv.probe = vfio_ap_queue_dev_probe;

	vfio_ap_drv.remove = vfio_ap_queue_dev_remove;

	vfio_ap_drv.ids = ap_queue_ids;



	ret = ap_driver_register(&vfio_ap_drv, THIS_MODULE, VFIO_AP_DRV_NAME);

	if (ret) {

		vfio_ap_matrix_dev_destroy();