lkml.org 
[lkml]   [2021]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/11] vfio-pci: rename ops functions to fit core namings
    Date
    This is another preparation patch for separating the vfio_pci driver to
    a subsystem driver and a generic pci driver. This patch doesn't change
    any logic.

    Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
    ---
    drivers/vfio/pci/vfio_pci_core.c | 36 ++++++++++++++++----------------
    1 file changed, 18 insertions(+), 18 deletions(-)

    diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c
    index a6a9d1aaa185..2d2fa64cc8a0 100644
    --- a/drivers/vfio/pci/vfio_pci_core.c
    +++ b/drivers/vfio/pci/vfio_pci_core.c
    @@ -533,7 +533,7 @@ static void vfio_pci_vf_token_user_add(struct vfio_pci_core_device *vdev, int va
    vfio_device_put(&pf_vdev->vdev);
    }

    -static void vfio_pci_release(struct vfio_device *core_vdev)
    +static void vfio_pci_core_release(struct vfio_device *core_vdev)
    {
    struct vfio_pci_core_device *vdev =
    container_of(core_vdev, struct vfio_pci_core_device, vdev);
    @@ -556,7 +556,7 @@ static void vfio_pci_release(struct vfio_device *core_vdev)
    mutex_unlock(&vdev->igate);
    }

    -static int vfio_pci_open(struct vfio_device *core_vdev)
    +static int vfio_pci_core_open(struct vfio_device *core_vdev)
    {
    struct vfio_pci_core_device *vdev =
    container_of(core_vdev, struct vfio_pci_core_device, vdev);
    @@ -763,7 +763,7 @@ struct vfio_devices {
    int max_index;
    };

    -static long vfio_pci_ioctl(struct vfio_device *core_vdev,
    +static long vfio_pci_core_ioctl(struct vfio_device *core_vdev,
    unsigned int cmd, unsigned long arg)
    {
    struct vfio_pci_core_device *vdev =
    @@ -1394,7 +1394,7 @@ static ssize_t vfio_pci_rw(struct vfio_pci_core_device *vdev, char __user *buf,
    return -EINVAL;
    }

    -static ssize_t vfio_pci_read(struct vfio_device *core_vdev, char __user *buf,
    +static ssize_t vfio_pci_core_read(struct vfio_device *core_vdev, char __user *buf,
    size_t count, loff_t *ppos)
    {
    struct vfio_pci_core_device *vdev =
    @@ -1406,7 +1406,7 @@ static ssize_t vfio_pci_read(struct vfio_device *core_vdev, char __user *buf,
    return vfio_pci_rw(vdev, buf, count, ppos, false);
    }

    -static ssize_t vfio_pci_write(struct vfio_device *core_vdev, const char __user *buf,
    +static ssize_t vfio_pci_core_write(struct vfio_device *core_vdev, const char __user *buf,
    size_t count, loff_t *ppos)
    {
    struct vfio_pci_core_device *vdev =
    @@ -1612,7 +1612,7 @@ static const struct vm_operations_struct vfio_pci_mmap_ops = {
    .fault = vfio_pci_mmap_fault,
    };

    -static int vfio_pci_mmap(struct vfio_device *core_vdev, struct vm_area_struct *vma)
    +static int vfio_pci_core_mmap(struct vfio_device *core_vdev, struct vm_area_struct *vma)
    {
    struct vfio_pci_core_device *vdev =
    container_of(core_vdev, struct vfio_pci_core_device, vdev);
    @@ -1683,7 +1683,7 @@ static int vfio_pci_mmap(struct vfio_device *core_vdev, struct vm_area_struct *v
    return 0;
    }

    -static void vfio_pci_request(struct vfio_device *core_vdev, unsigned int count)
    +static void vfio_pci_core_request(struct vfio_device *core_vdev, unsigned int count)
    {
    struct vfio_pci_core_device *vdev =
    container_of(core_vdev, struct vfio_pci_core_device, vdev);
    @@ -1799,7 +1799,7 @@ static int vfio_pci_validate_vf_token(struct vfio_pci_core_device *vdev,

    #define VF_TOKEN_ARG "vf_token="

    -static int vfio_pci_match(struct vfio_device *core_vdev, char *buf)
    +static int vfio_pci_core_match(struct vfio_device *core_vdev, char *buf)
    {
    struct vfio_pci_core_device *vdev =
    container_of(core_vdev, struct vfio_pci_core_device, vdev);
    @@ -1874,7 +1874,7 @@ static int vfio_pci_reflck_find(struct pci_dev *pdev, void *data)
    return 0;
    }

    -static int vfio_pci_reflck_attach(struct vfio_device *core_vdev)
    +static int vfio_pci_core_reflck_attach(struct vfio_device *core_vdev)
    {
    struct vfio_pci_core_device *vdev =
    container_of(core_vdev, struct vfio_pci_core_device, vdev);
    @@ -1890,15 +1890,15 @@ static int vfio_pci_reflck_attach(struct vfio_device *core_vdev)

    static const struct vfio_device_ops vfio_pci_ops = {
    .name = "vfio-pci",
    - .open = vfio_pci_open,
    - .release = vfio_pci_release,
    - .ioctl = vfio_pci_ioctl,
    - .read = vfio_pci_read,
    - .write = vfio_pci_write,
    - .mmap = vfio_pci_mmap,
    - .request = vfio_pci_request,
    - .match = vfio_pci_match,
    - .reflck_attach = vfio_pci_reflck_attach,
    + .open = vfio_pci_core_open,
    + .release = vfio_pci_core_release,
    + .ioctl = vfio_pci_core_ioctl,
    + .read = vfio_pci_core_read,
    + .write = vfio_pci_core_write,
    + .mmap = vfio_pci_core_mmap,
    + .request = vfio_pci_core_request,
    + .match = vfio_pci_core_match,
    + .reflck_attach = vfio_pci_core_reflck_attach,
    };

    static int vfio_pci_bus_notifier(struct notifier_block *nb,
    --
    2.21.0
    \
     
     \ /
      Last update: 2021-06-03 18:09    [W:2.576 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site