On 11/21/22 4:40 PM, Eric Farman wrote:
> There is no longer an mdev struct accessible via a channel
> program struct, but there are some artifacts remaining that
> mention it. Clean them up.
>
> Fixes: 0a58795647cd ("vfio/ccw: Remove mdev from struct channel_program")
Since it's only some changes in code comments, I don't think this needs to go to stable via a fixes tag.
Otherwise:
Reviewed-by: Matthew Rosato <mjrosato@xxxxxxxxxxxxx>
> Signed-off-by: Eric Farman <farman@xxxxxxxxxxxxx>
> ---
> drivers/s390/cio/vfio_ccw_cp.c | 5 ++---
> drivers/s390/cio/vfio_ccw_cp.h | 1 -
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_cp.c
> index c0a09fa8991a..9e6df1f2fbee 100644
> --- a/drivers/s390/cio/vfio_ccw_cp.c
> +++ b/drivers/s390/cio/vfio_ccw_cp.c
> @@ -121,7 +121,7 @@ static void page_array_unpin(struct page_array *pa,
> /*
> * page_array_pin() - Pin user pages in memory
> * @pa: page_array on which to perform the operation
> - * @mdev: the mediated device to perform pin operations
> + * @vdev: the vfio device to perform pin operations
> *
> * Returns number of pages pinned upon success.
> * If the pin request partially succeeds, or fails completely,
> @@ -229,7 +229,7 @@ static void convert_ccw0_to_ccw1(struct ccw1 *source, unsigned long len)
> }
>
> /*
> - * Within the domain (@mdev), copy @n bytes from a guest physical
> + * Within the domain (@vdev), copy @n bytes from a guest physical
> * address (@iova) to a host physical address (@to).
> */
> static long copy_from_iova(struct vfio_device *vdev, void *to, u64 iova,
> @@ -665,7 +665,6 @@ static int ccwchain_fetch_one(struct ccwchain *chain,
> /**
> * cp_init() - allocate ccwchains for a channel program.
> * @cp: channel_program on which to perform the operation
> - * @mdev: the mediated device to perform pin/unpin operations
> * @orb: control block for the channel program from the guest
> *
> * This creates one or more ccwchain(s), and copies the raw data of
> diff --git a/drivers/s390/cio/vfio_ccw_cp.h b/drivers/s390/cio/vfio_ccw_cp.h
> index 54d26e242533..16138a654fdd 100644
> --- a/drivers/s390/cio/vfio_ccw_cp.h
> +++ b/drivers/s390/cio/vfio_ccw_cp.h
> @@ -27,7 +27,6 @@
> * struct channel_program - manage information for channel program
> * @ccwchain_list: list head of ccwchains
> * @orb: orb for the currently processed ssch request
> - * @mdev: the mediated device to perform page pinning/unpinning
> * @initialized: whether this instance is actually initialized
> *
> * @ccwchain_list is the head of a ccwchain list, that contents the
