[PATCH 7/8] vfio/mdev: remove mdev_parent_dev

[Tian, Kevin]

> From: Christoph Hellwig
> Sent: Friday, June 3, 2022 2:33 PM
> 
> Just open code the dereferences in the only user.
> 
> Signed-off-by: Christoph Hellwig <hch at lst.de>

Reviewed-by: Kevin Tian <kevin.tian at intel.com>

> ---
>  Documentation/driver-api/vfio-mediated-device.rst | 3 ---
>  drivers/gpu/drm/i915/gvt/kvmgt.c                  | 2 +-
>  drivers/vfio/mdev/mdev_core.c                     | 6 ------
>  include/linux/mdev.h                              | 1 -
>  4 files changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/Documentation/driver-api/vfio-mediated-device.rst
> b/Documentation/driver-api/vfio-mediated-device.rst
> index 8ff463aa9e2be..0d74ac2a218f2 100644
> --- a/Documentation/driver-api/vfio-mediated-device.rst
> +++ b/Documentation/driver-api/vfio-mediated-device.rst
> @@ -201,9 +201,6 @@ Directories and files under the sysfs for Each Physical
> Device
> 
>  	sprintf(buf, "%s-%s", dev_driver_string(parent->dev), group->name);
> 
> -  (or using mdev_parent_dev(mdev) to arrive at the parent device outside
> -  of the core mdev code)
> -
>  * device_api
> 
>    This attribute should show which device API is being created, for example,
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c
> b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index 06b8acc6a995d..f3c4ce475ce86 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -1554,7 +1554,7 @@ static const struct vfio_device_ops
> intel_vgpu_dev_ops = {
> 
>  static int intel_vgpu_probe(struct mdev_device *mdev)
>  {
> -	struct device *pdev = mdev_parent_dev(mdev);
> +	struct device *pdev = mdev->type->parent->dev;
>  	struct intel_gvt *gvt = kdev_to_i915(pdev)->gvt;
>  	struct intel_vgpu_type *type =
>  		container_of(mdev->type, struct intel_vgpu_type, type);
> diff --git a/drivers/vfio/mdev/mdev_core.c
> b/drivers/vfio/mdev/mdev_core.c
> index 3575e893b5e43..3bdea77d506d9 100644
> --- a/drivers/vfio/mdev/mdev_core.c
> +++ b/drivers/vfio/mdev/mdev_core.c
> @@ -25,12 +25,6 @@ static struct class_compat *mdev_bus_compat_class;
>  static LIST_HEAD(mdev_list);
>  static DEFINE_MUTEX(mdev_list_lock);
> 
> -struct device *mdev_parent_dev(struct mdev_device *mdev)
> -{
> -	return mdev->type->parent->dev;
> -}
> -EXPORT_SYMBOL(mdev_parent_dev);
> -
>  /*
>   * Used in mdev_type_attribute sysfs functions to return the parent struct
>   * device
> diff --git a/include/linux/mdev.h b/include/linux/mdev.h
> index f92b4d8edf0e8..6d0a9b45a9eb6 100644
> --- a/include/linux/mdev.h
> +++ b/include/linux/mdev.h
> @@ -95,7 +95,6 @@ void mdev_unregister_parent(struct mdev_parent
> *parent);
>  int mdev_register_driver(struct mdev_driver *drv);
>  void mdev_unregister_driver(struct mdev_driver *drv);
> 
> -struct device *mdev_parent_dev(struct mdev_device *mdev);
>  static inline struct device *mdev_dev(struct mdev_device *mdev)
>  {
>  	return &mdev->dev;
> --
> 2.30.2