Skip to content

Commit

Permalink
vfio-ccw: Remove copy_ccw_from_iova()
Browse files Browse the repository at this point in the history
Just to keep things tidy.

Signed-off-by: Eric Farman <farman@linux.ibm.com>
Message-Id: <20190618202352.39702-6-farman@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Farhan Ali <alifm@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
  • Loading branch information
Eric Farman authored and Cornelia Huck committed Jun 21, 2019
1 parent 7f8e89a commit 5223bee
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions drivers/s390/cio/vfio_ccw_cp.c
Original file line number Diff line number Diff line change
Expand Up @@ -228,17 +228,6 @@ static long copy_from_iova(struct device *mdev,
return l;
}

static long copy_ccw_from_iova(struct channel_program *cp,
struct ccw1 *to, u64 iova,
unsigned long len)
{
int ret;

ret = copy_from_iova(cp->mdev, to, iova, len * sizeof(struct ccw1));

return ret;
}

/*
* Helpers to operate ccwchain.
*/
Expand Down Expand Up @@ -435,7 +424,8 @@ static int ccwchain_handle_ccw(u32 cda, struct channel_program *cp)
int len;

/* Copy 2K (the most we support today) of possible CCWs */
len = copy_ccw_from_iova(cp, cp->guest_cp, cda, CCWCHAIN_LEN_MAX);
len = copy_from_iova(cp->mdev, cp->guest_cp, cda,
CCWCHAIN_LEN_MAX * sizeof(struct ccw1));
if (len)
return len;

Expand Down

0 comments on commit 5223bee

Please sign in to comment.