Commit 32dfb611 authored by Giovanni Di Santi's avatar Giovanni Di Santi Committed by Helge Deller
Browse files

fbdev: kyro: Use devm_ioremap_wc() for screen mem 



Replace the manual pci_ioremap_wc() call for mapping screen memory with the
device-managed devm_ioremap_wc() variant.

This simplifies the driver's resource management by ensuring the memory is
automatically unmapped when the driver detaches from the device.

Signed-off-by: default avatarGiovanni Di Santi <giovanni.disanti.lkl@gmail.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent e0bf12a4

drivers/video/fbdev/kyro/fbdev.c

+3 −6
Original line number Diff line number Diff line
@@ -706,7 +706,8 @@ static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (!currentpar->regbase)

		goto out_free_fb;



	info->screen_base = pci_ioremap_wc_bar(pdev, 0);

	info->screen_base = devm_ioremap_wc(&pdev->dev, kyro_fix.smem_start,

					    kyro_fix.smem_len);

	if (!info->screen_base)

		goto out_free_fb;
@@ -743,7 +744,7 @@ static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	fb_memset_io(info->screen_base, 0, size);



	if (register_framebuffer(info) < 0)

		goto out_unmap;

		goto out_free_fb;



	fb_info(info, "%s frame buffer device, at %dx%d@%d using %ldk/%ldk of VRAM\n",

		info->fix.id,
@@ -754,8 +755,6 @@ static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	return 0;



out_unmap:

	iounmap(info->screen_base);

out_free_fb:

	framebuffer_release(info);
@@ -777,8 +776,6 @@ static void kyrofb_remove(struct pci_dev *pdev) 
	deviceInfo.ulNextFreeVidMem = 0;

	deviceInfo.ulOverlayOffset = 0;



	iounmap(info->screen_base);



	arch_phys_wc_del(par->wc_cookie);



	unregister_framebuffer(info);