vfio/ccw: Remove private->mdev

There are no remaining users of private->mdev. Remove it.

Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20220707135737.720765-5-farman@linux.ibm.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

diff --git a/drivers/s390/cio/vfio_ccw_async.c b/drivers/s390/cio/vfio_ccw_async.c
index 7a838e3d7c0fae3a209fdf763a640bd140091c1f..420d89ba7f8387193a04470e560db32c38d543ee 100644 (file)
--- a/drivers/s390/cio/vfio_ccw_async.c
+++ b/drivers/s390/cio/vfio_ccw_async.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/vfio.h>
-#include <linux/mdev.h>
 
 #include "vfio_ccw_private.h"
 

diff --git a/drivers/s390/cio/vfio_ccw_ops.c b/drivers/s390/cio/vfio_ccw_ops.c
index 9a05dadcbb7545298676fa6783cb4f6890054d61..81377270d4a74dee8b86fd5623bf1784eb429cf3 100644 (file)
--- a/drivers/s390/cio/vfio_ccw_ops.c
+++ b/drivers/s390/cio/vfio_ccw_ops.c
@@ -128,7 +128,6 @@ static int vfio_ccw_mdev_probe(struct mdev_device *mdev)
        vfio_init_group_dev(&private->vdev, &mdev->dev,
                            &vfio_ccw_dev_ops);
 
-       private->mdev = mdev;
        private->state = VFIO_CCW_STATE_IDLE;
 
        VFIO_CCW_MSG_EVENT(2, "sch %x.%x.%04x: create\n",
@@ -145,7 +144,6 @@ static int vfio_ccw_mdev_probe(struct mdev_device *mdev)
 err_atomic:
        vfio_uninit_group_dev(&private->vdev);
        atomic_inc(&private->avail);
-       private->mdev = NULL;
        private->state = VFIO_CCW_STATE_STANDBY;
        return ret;
 }
@@ -170,7 +168,6 @@ static void vfio_ccw_mdev_remove(struct mdev_device *mdev)
 
        vfio_uninit_group_dev(&private->vdev);
        cp_free(&private->cp);
-       private->mdev = NULL;
        atomic_inc(&private->avail);
 }
 

diff --git a/drivers/s390/cio/vfio_ccw_private.h b/drivers/s390/cio/vfio_ccw_private.h
index b7163bac8cc75d6716adf37fa93d261df981ba3b..4d11ef48333eecaf2282d1be8cfffa9703c37483 100644 (file)
--- a/drivers/s390/cio/vfio_ccw_private.h
+++ b/drivers/s390/cio/vfio_ccw_private.h
@@ -73,7 +73,6 @@ struct vfio_ccw_crw {
  * @state: internal state of the device
  * @completion: synchronization helper of the I/O completion
  * @avail: available for creating a mediated device
- * @mdev: pointer to the mediated device
  * @nb: notifier for vfio events
  * @io_region: MMIO region to input/output I/O arguments/results
  * @io_mutex: protect against concurrent update of I/O regions
@@ -97,7 +96,6 @@ struct vfio_ccw_private {
        int                     state;
        struct completion       *completion;
        atomic_t                avail;
-       struct mdev_device      *mdev;
        struct notifier_block   nb;
        struct ccw_io_region    *io_region;
        struct mutex            io_mutex;