public inbox for linux-s390@vger.kernel.org
 help / color / mirror / Atom feed
From: Eric Farman <farman@linux.ibm.com>
To: Matthew Rosato <mjrosato@linux.ibm.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>,
	Alex Williamson <alex.williamson@redhat.com>,
	Cornelia Huck <cohuck@redhat.com>,
	Halil Pasic <pasic@linux.ibm.com>,
	kvm@vger.kernel.org, linux-s390@vger.kernel.org,
	Eric Farman <farman@linux.ibm.com>
Subject: [PATCH v2 04/10] vfio/ccw: Remove private->mdev
Date: Wed, 15 Jun 2022 22:33:12 +0200	[thread overview]
Message-ID: <20220615203318.3830778-5-farman@linux.ibm.com> (raw)
In-Reply-To: <20220615203318.3830778-1-farman@linux.ibm.com>

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>
---
 drivers/s390/cio/vfio_ccw_async.c   | 1 -
 drivers/s390/cio/vfio_ccw_ops.c     | 3 ---
 drivers/s390/cio/vfio_ccw_private.h | 2 --
 3 files changed, 6 deletions(-)

diff --git a/drivers/s390/cio/vfio_ccw_async.c b/drivers/s390/cio/vfio_ccw_async.c
index 7a838e3d7c0f..420d89ba7f83 100644
--- 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 9a05dadcbb75..81377270d4a7 100644
--- 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 7272eb788612..12b5537d478f 100644
--- 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;
-- 
2.32.0


  parent reply	other threads:[~2022-06-15 20:34 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-15 20:33 [PATCH v2 00/10] s390/vfio-ccw rework Eric Farman
2022-06-15 20:33 ` [PATCH v2 01/10] vfio/ccw: Remove UUID from s390 debug log Eric Farman
2022-06-15 20:57   ` Kirti Wankhede
2022-06-15 20:33 ` [PATCH v2 02/10] vfio/ccw: Fix FSM state if mdev probe fails Eric Farman
2022-06-15 20:33 ` [PATCH v2 03/10] vfio/ccw: Do not change FSM state in subchannel event Eric Farman
2022-06-16 15:35   ` Matthew Rosato
2022-06-16 17:13     ` Eric Farman
2022-06-15 20:33 ` Eric Farman [this message]
2022-06-16 15:36   ` [PATCH v2 04/10] vfio/ccw: Remove private->mdev Matthew Rosato
2022-06-23 14:59   ` Jason Gunthorpe
2022-06-15 20:33 ` [PATCH v2 05/10] vfio/ccw: Pass enum to FSM event jumptable Eric Farman
2022-06-15 20:33 ` [PATCH v2 06/10] vfio/ccw: Flatten MDEV device (un)register Eric Farman
2022-06-15 20:33 ` [PATCH v2 07/10] vfio/ccw: Create an OPEN FSM Event Eric Farman
2022-06-16 16:33   ` Matthew Rosato
2022-06-16 17:14     ` Eric Farman
2022-06-16 17:18       ` Matthew Rosato
2022-06-15 20:33 ` [PATCH v2 08/10] vfio/ccw: Create a CLOSE FSM event Eric Farman
2022-06-16 16:48   ` Matthew Rosato
2022-06-15 20:33 ` [PATCH v2 09/10] vfio/ccw: Refactor vfio_ccw_mdev_reset Eric Farman
2022-06-15 20:33 ` [PATCH v2 10/10] vfio/ccw: Move FSM open/close to MDEV open/close Eric Farman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220615203318.3830778-5-farman@linux.ibm.com \
    --to=farman@linux.ibm.com \
    --cc=alex.williamson@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=jgg@nvidia.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=mjrosato@linux.ibm.com \
    --cc=pasic@linux.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox