On Wed, 31 Aug 2022 09:59:43 +0100
Shameer Kolothum <shameerali.kolothum.thodi@xxxxxxxxxx> wrote:
> Commit 91be0bd6c6cf("vfio/pci: Have all VFIO PCI drivers store the
> vfio_pci_core_device in drvdata") introduced a helper function to
> retrieve the drvdata but used "hssi" instead of "hisi" for the
> function prefix. Correct that and also while at it, moved the
> function a bit down so that it's close to other hisi_ prefixed
> functions.
>
> No functional changes.
>
> Fixes: 91be0bd6c6cf("vfio/pci: Have all VFIO PCI drivers store the vfio_pci_core_device in drvdata")
The above two lines are usually mutually exclusive, the latter will
cause this change to be backported to all releases including that
commit. As a largely aesthetic change, is that what you're looking
for? Thanks,
Alex
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@xxxxxxxxxx>
> ---
> .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 20 +++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
> index ea762e28c1cc..258cae0863ea 100644
> --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
> +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
> @@ -337,14 +337,6 @@ static int vf_qm_cache_wb(struct hisi_qm *qm)
> return 0;
> }
>
> -static struct hisi_acc_vf_core_device *hssi_acc_drvdata(struct pci_dev *pdev)
> -{
> - struct vfio_pci_core_device *core_device = dev_get_drvdata(&pdev->dev);
> -
> - return container_of(core_device, struct hisi_acc_vf_core_device,
> - core_device);
> -}
> -
> static void vf_qm_fun_reset(struct hisi_acc_vf_core_device *hisi_acc_vdev,
> struct hisi_qm *qm)
> {
> @@ -552,6 +544,14 @@ static int vf_qm_state_save(struct hisi_acc_vf_core_device *hisi_acc_vdev,
> return 0;
> }
>
> +static struct hisi_acc_vf_core_device *hisi_acc_drvdata(struct pci_dev *pdev)
> +{
> + struct vfio_pci_core_device *core_device = dev_get_drvdata(&pdev->dev);
> +
> + return container_of(core_device, struct hisi_acc_vf_core_device,
> + core_device);
> +}
> +
> /* Check the PF's RAS state and Function INT state */
> static int
> hisi_acc_check_int_state(struct hisi_acc_vf_core_device *hisi_acc_vdev)
> @@ -970,7 +970,7 @@ hisi_acc_vfio_pci_get_device_state(struct vfio_device *vdev,
>
> static void hisi_acc_vf_pci_aer_reset_done(struct pci_dev *pdev)
> {
> - struct hisi_acc_vf_core_device *hisi_acc_vdev = hssi_acc_drvdata(pdev);
> + struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_drvdata(pdev);
>
> if (hisi_acc_vdev->core_device.vdev.migration_flags !=
> VFIO_MIGRATION_STOP_COPY)
> @@ -1301,7 +1301,7 @@ static int hisi_acc_vfio_pci_probe(struct pci_dev *pdev, const struct pci_device
>
> static void hisi_acc_vfio_pci_remove(struct pci_dev *pdev)
> {
> - struct hisi_acc_vf_core_device *hisi_acc_vdev = hssi_acc_drvdata(pdev);
> + struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_drvdata(pdev);
>
> vfio_pci_core_unregister_device(&hisi_acc_vdev->core_device);
> vfio_pci_core_uninit_device(&hisi_acc_vdev->core_device);
