[PATCH v2 08/20] drm/hibmc: Remove references to struct drm_device.pdev

[tiantao (H)]

在 2020/12/1 18:35, Thomas Zimmermann 写道:
> Using struct drm_device.pdev is deprecated. Convert hibmc to struct
> drm_device.dev. No functional changes.
> 
> Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
> Acked-by: Sam Ravnborg <sam at ravnborg.org>
> Cc: Xinliang Liu <xinliang.liu at linaro.org>
> Cc: Tian Tao  <tiantao6 at hisilicon.com>
> Cc: John Stultz <john.stultz at linaro.org>
> Cc: Xinwei Kong <kong.kongxinwei at hisilicon.com>
> Cc: Chen Feng <puck.chen at hisilicon.com>
> ---
>   drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 10 +++++-----
>   drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c |  2 +-
>   drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c     |  4 ++--
>   3 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> index d845657fd99c..ac5868343d0c 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> @@ -203,7 +203,7 @@ static void hibmc_hw_config(struct hibmc_drm_private *priv)
>   static int hibmc_hw_map(struct hibmc_drm_private *priv)
>   {
>   	struct drm_device *dev = priv->dev;
> -	struct pci_dev *pdev = dev->pdev;
> +	struct pci_dev *pdev = to_pci_dev(dev->dev);
>   	resource_size_t addr, size, ioaddr, iosize;
>   
>   	ioaddr = pci_resource_start(pdev, 1);
> @@ -249,7 +249,7 @@ static int hibmc_unload(struct drm_device *dev)
>   	if (dev->irq_enabled)
>   		drm_irq_uninstall(dev);
>   
> -	pci_disable_msi(dev->pdev);
> +	pci_disable_msi(to_pci_dev(dev->dev));
>   	hibmc_kms_fini(priv);
>   	hibmc_mm_fini(priv);
>   	dev->dev_private = NULL;
> @@ -258,6 +258,7 @@ static int hibmc_unload(struct drm_device *dev)
>   
>   static int hibmc_load(struct drm_device *dev)
>   {
> +	struct pci_dev *pdev = to_pci_dev(dev->dev);
>   	struct hibmc_drm_private *priv;
>   	int ret;
>   
> @@ -287,11 +288,11 @@ static int hibmc_load(struct drm_device *dev)
>   		goto err;
>   	}
>   
> -	ret = pci_enable_msi(dev->pdev);
> +	ret = pci_enable_msi(pdev);
>   	if (ret) {
>   		drm_warn(dev, "enabling MSI failed: %d\n", ret);
>   	} else {
> -		ret = drm_irq_install(dev, dev->pdev->irq);
> +		ret = drm_irq_install(dev, pdev->irq);
>   		if (ret)
>   			drm_warn(dev, "install irq failed: %d\n", ret);
>   	}
> @@ -324,7 +325,6 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
>   		return PTR_ERR(dev);
>   	}
>   
> -	dev->pdev = pdev;
>   	pci_set_drvdata(pdev, dev);
>   
>   	ret = pci_enable_device(pdev);
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c
> index 86d712090d87..410bd019bb35 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c
> @@ -83,7 +83,7 @@ int hibmc_ddc_create(struct drm_device *drm_dev,
>   	connector->adapter.owner = THIS_MODULE;
>   	connector->adapter.class = I2C_CLASS_DDC;
>   	snprintf(connector->adapter.name, I2C_NAME_SIZE, "HIS i2c bit bus");
> -	connector->adapter.dev.parent = &drm_dev->pdev->dev;
> +	connector->adapter.dev.parent = drm_dev->dev;
>   	i2c_set_adapdata(&connector->adapter, connector);
>   	connector->adapter.algo_data = &connector->bit_data;
>   
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
> index 602ece11bb4a..77f075075db2 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
> @@ -26,9 +26,9 @@ int hibmc_mm_init(struct hibmc_drm_private *hibmc)
>   	struct drm_vram_mm *vmm;
>   	int ret;
>   	struct drm_device *dev = hibmc->dev;
> +	struct pci_dev *pdev = to_pci_dev(dev->dev);
>   
> -	vmm = drm_vram_helper_alloc_mm(dev,
> -				       pci_resource_start(dev->pdev, 0),
> +	vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0),
>   				       hibmc->fb_size);
>   	if (IS_ERR(vmm)) {
>   		ret = PTR_ERR(vmm);
> 
Reviewed-by: Tian Tao <tiantao6 at hisilicon.com>