| Message ID | 20240630165949.117634-2-wuhoipok@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/radeon: remove load callback & drm_dev_alloc | expand |
Am 30.06.24 um 18:59 schrieb Wu Hoi Pok: > In the probe function of amdgpu, it uses "ddev" as the name of "struct drm_device *", > so I suggest renaming it to be consistent. > > Signed-off-by: Wu Hoi Pok <wuhoipok@gmail.com> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Tested-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/radeon/radeon_drv.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c > index 7bf08164140e..739bb1da9dcc 100644 > --- a/drivers/gpu/drm/radeon/radeon_drv.c > +++ b/drivers/gpu/drm/radeon/radeon_drv.c > @@ -259,7 +259,7 @@ static int radeon_pci_probe(struct pci_dev *pdev, > const struct pci_device_id *ent) > { > unsigned long flags = 0; > - struct drm_device *dev; > + struct drm_device *ddev; > int ret; > > if (!ent) > @@ -300,28 +300,28 @@ static int radeon_pci_probe(struct pci_dev *pdev, > if (ret) > return ret; > > - dev = drm_dev_alloc(&kms_driver, &pdev->dev); > - if (IS_ERR(dev)) > - return PTR_ERR(dev); > + ddev = drm_dev_alloc(&kms_driver, &pdev->dev); > + if (IS_ERR(ddev)) > + return PTR_ERR(ddev); > > ret = pci_enable_device(pdev); > if (ret) > goto err_free; > > - pci_set_drvdata(pdev, dev); > + pci_set_drvdata(pdev, ddev); > > - ret = drm_dev_register(dev, ent->driver_data); > + ret = drm_dev_register(ddev, ent->driver_data); > if (ret) > goto err_agp; > > - radeon_fbdev_setup(dev->dev_private); > + radeon_fbdev_setup(ddev->dev_private); > > return 0; > > err_agp: > pci_disable_device(pdev); > err_free: > - drm_dev_put(dev); > + drm_dev_put(ddev); > return ret; > } >
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 7bf08164140e..739bb1da9dcc 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -259,7 +259,7 @@ static int radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { unsigned long flags = 0; - struct drm_device *dev; + struct drm_device *ddev; int ret; if (!ent) @@ -300,28 +300,28 @@ static int radeon_pci_probe(struct pci_dev *pdev, if (ret) return ret; - dev = drm_dev_alloc(&kms_driver, &pdev->dev); - if (IS_ERR(dev)) - return PTR_ERR(dev); + ddev = drm_dev_alloc(&kms_driver, &pdev->dev); + if (IS_ERR(ddev)) + return PTR_ERR(ddev); ret = pci_enable_device(pdev); if (ret) goto err_free; - pci_set_drvdata(pdev, dev); + pci_set_drvdata(pdev, ddev); - ret = drm_dev_register(dev, ent->driver_data); + ret = drm_dev_register(ddev, ent->driver_data); if (ret) goto err_agp; - radeon_fbdev_setup(dev->dev_private); + radeon_fbdev_setup(ddev->dev_private); return 0; err_agp: pci_disable_device(pdev); err_free: - drm_dev_put(dev); + drm_dev_put(ddev); return ret; }
In the probe function of amdgpu, it uses "ddev" as the name of "struct drm_device *", so I suggest renaming it to be consistent. Signed-off-by: Wu Hoi Pok <wuhoipok@gmail.com> --- drivers/gpu/drm/radeon/radeon_drv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)