Commit deddc912 authored by Daniel Vetter's avatar Daniel Vetter Committed by Thomas Zimmermann
Browse files

staging/lynxfb: Use pci aperture helper 



It exists! Note that since this is an exact copy, there shouldn't be
any functional difference here.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Teddy Wang <teddy.wang@siliconmotion.com>
Cc: linux-fbdev@vger.kernel.org
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230111154112.90575-6-daniel.vetter@ffwll.ch
parent c1ebead3

drivers/staging/sm750fb/sm750.c

+1 −15
Original line number Diff line number Diff line
@@ -989,20 +989,6 @@ static int sm750fb_framebuffer_alloc(struct sm750_dev *sm750_dev, int fbidx) 
	return err;

}



static int lynxfb_kick_out_firmware_fb(struct pci_dev *pdev)

{

	resource_size_t base = pci_resource_start(pdev, 0);

	resource_size_t size = pci_resource_len(pdev, 0);

	bool primary = false;



#ifdef CONFIG_X86

	primary = pdev->resource[PCI_ROM_RESOURCE].flags &

					IORESOURCE_ROM_SHADOW;

#endif



	return aperture_remove_conflicting_devices(base, size, primary, "sm750_fb1");

}



static int lynxfb_pci_probe(struct pci_dev *pdev,

			    const struct pci_device_id *ent)

{
@@ -1011,7 +997,7 @@ static int lynxfb_pci_probe(struct pci_dev *pdev, 
	int fbidx;

	int err;



	err = lynxfb_kick_out_firmware_fb(pdev);

	err = aperture_remove_conflicting_pci_devices(pdev, "sm750_fb1");

	if (err)

		return err;