| Message ID | 1740845791-19977-2-git-send-email-ssengar@linux.microsoft.com |
|---|---|
| State | New |
| Headers | show |
| Series | fbdev: hyperv_fb: framebuffer release cleanup | expand |
From: Saurabh Sengar <ssengar@linux.microsoft.com> Sent: Saturday, March 1, 2025 8:17 AM > > The device object required in 'hvfb_release_phymem' function > for 'dma_free_coherent' can also be obtained from the 'info' > pointer, making 'hdev' parameter in 'hvfb_putmem' redundant. > Remove the unnecessary 'hdev' argument from 'hvfb_putmem'. > > Signed-off-by: Saurabh Sengar <ssengar@linux.microsoft.com> > --- > drivers/video/fbdev/hyperv_fb.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c > index 363e4ccfcdb7..09fb025477f7 100644 > --- a/drivers/video/fbdev/hyperv_fb.c > +++ b/drivers/video/fbdev/hyperv_fb.c > @@ -952,7 +952,7 @@ static phys_addr_t hvfb_get_phymem(struct hv_device *hdev, > } > > /* Release contiguous physical memory */ > -static void hvfb_release_phymem(struct hv_device *hdev, > +static void hvfb_release_phymem(struct device *device, > phys_addr_t paddr, unsigned int size) > { > unsigned int order = get_order(size); > @@ -960,7 +960,7 @@ static void hvfb_release_phymem(struct hv_device *hdev, > if (order <= MAX_PAGE_ORDER) > __free_pages(pfn_to_page(paddr >> PAGE_SHIFT), order); > else > - dma_free_coherent(&hdev->device, > + dma_free_coherent(device, > round_up(size, PAGE_SIZE), > phys_to_virt(paddr), > paddr); > @@ -1074,7 +1074,7 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) > } > > /* Release the framebuffer */ > -static void hvfb_putmem(struct hv_device *hdev, struct fb_info *info) > +static void hvfb_putmem(struct fb_info *info) > { > struct hvfb_par *par = info->par; > > @@ -1083,7 +1083,7 @@ static void hvfb_putmem(struct hv_device *hdev, struct fb_info *info) > iounmap(par->mmio_vp); > vmbus_free_mmio(par->mem->start, screen_fb_size); > } else { > - hvfb_release_phymem(hdev, info->fix.smem_start, > + hvfb_release_phymem(info->device, info->fix.smem_start, > screen_fb_size); > } > > @@ -1197,7 +1197,7 @@ static int hvfb_probe(struct hv_device *hdev, > > error: > fb_deferred_io_cleanup(info); > - hvfb_putmem(hdev, info); > + hvfb_putmem(info); > error2: > vmbus_close(hdev->channel); > error1: > @@ -1226,7 +1226,7 @@ static void hvfb_remove(struct hv_device *hdev) > vmbus_close(hdev->channel); > hv_set_drvdata(hdev, NULL); > > - hvfb_putmem(hdev, info); > + hvfb_putmem(info); > framebuffer_release(info); > } > > -- > 2.43.0 Reviewed-by: Michael Kelley <mhklinux@outlook.com> Tested-by: Michael Kelley <mhklinux@outlook.com>
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index 363e4ccfcdb7..09fb025477f7 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -952,7 +952,7 @@ static phys_addr_t hvfb_get_phymem(struct hv_device *hdev, } /* Release contiguous physical memory */ -static void hvfb_release_phymem(struct hv_device *hdev, +static void hvfb_release_phymem(struct device *device, phys_addr_t paddr, unsigned int size) { unsigned int order = get_order(size); @@ -960,7 +960,7 @@ static void hvfb_release_phymem(struct hv_device *hdev, if (order <= MAX_PAGE_ORDER) __free_pages(pfn_to_page(paddr >> PAGE_SHIFT), order); else - dma_free_coherent(&hdev->device, + dma_free_coherent(device, round_up(size, PAGE_SIZE), phys_to_virt(paddr), paddr); @@ -1074,7 +1074,7 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) } /* Release the framebuffer */ -static void hvfb_putmem(struct hv_device *hdev, struct fb_info *info) +static void hvfb_putmem(struct fb_info *info) { struct hvfb_par *par = info->par; @@ -1083,7 +1083,7 @@ static void hvfb_putmem(struct hv_device *hdev, struct fb_info *info) iounmap(par->mmio_vp); vmbus_free_mmio(par->mem->start, screen_fb_size); } else { - hvfb_release_phymem(hdev, info->fix.smem_start, + hvfb_release_phymem(info->device, info->fix.smem_start, screen_fb_size); } @@ -1197,7 +1197,7 @@ static int hvfb_probe(struct hv_device *hdev, error: fb_deferred_io_cleanup(info); - hvfb_putmem(hdev, info); + hvfb_putmem(info); error2: vmbus_close(hdev->channel); error1: @@ -1226,7 +1226,7 @@ static void hvfb_remove(struct hv_device *hdev) vmbus_close(hdev->channel); hv_set_drvdata(hdev, NULL); - hvfb_putmem(hdev, info); + hvfb_putmem(info); framebuffer_release(info); }
The device object required in 'hvfb_release_phymem' function for 'dma_free_coherent' can also be obtained from the 'info' pointer, making 'hdev' parameter in 'hvfb_putmem' redundant. Remove the unnecessary 'hdev' argument from 'hvfb_putmem'. Signed-off-by: Saurabh Sengar <ssengar@linux.microsoft.com> --- drivers/video/fbdev/hyperv_fb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)