Commit 35616a4a authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm: drop resource_id parameter from drm_fb_helper_remove_conflicting_pci_framebuffers 



Not needed any more for remove_conflicting_pci_framebuffers calls.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20190822090645.25410-3-kraxel@redhat.com
parent 0a845969

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1031,7 +1031,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, 
	}



	/* Get rid of things like offb */

	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "amdgpudrmfb");

	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "amdgpudrmfb");

	if (ret)

		return ret;

drivers/gpu/drm/bochs/bochs_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static int bochs_pci_probe(struct pci_dev *pdev, 
		return -ENOMEM;

	}



	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "bochsdrmfb");

	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "bochsdrmfb");

	if (ret)

		return ret;

drivers/gpu/drm/cirrus/cirrus.c

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ static int cirrus_pci_probe(struct pci_dev *pdev, 
	struct cirrus_device *cirrus;

	int ret;



	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "cirrusdrmfb");

	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "cirrusdrmfb");

	if (ret)

		return ret;

drivers/gpu/drm/mgag200/mgag200_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist); 


static int mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "mgag200drmfb");

	drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "mgag200drmfb");



	return drm_get_pci_dev(pdev, ent, &driver);

}

drivers/gpu/drm/qxl/qxl_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (ret)

		goto free_dev;



	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "qxl");

	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "qxl");

	if (ret)

		goto disable_pci;

CRA Git | Maintained and supported by SUSTech CRA and CCSE