* [PATCH -next] video: fbdev: tridentfb: Fix missing pci_disable_device() in probe and remove
@ 2022-09-22 1:37 ruanjinjie
2022-09-25 16:21 ` Helge Deller
0 siblings, 1 reply; 3+ messages in thread
From: ruanjinjie @ 2022-09-22 1:37 UTC (permalink / raw)
To: deller, zheyuma97, javierm, wsa+renesas, tzimmermann, linux-fbdev,
dri-devel, linux-kernel
Cc: ruanjinjie
Replace pci_enable_device() with pcim_enable_device(),
pci_disable_device() and pci_release_regions() will be
called in release automatically.
Signed-off-by: ruanjinjie <ruanjinjie@huawei.com>
---
drivers/video/fbdev/tridentfb.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/video/fbdev/tridentfb.c b/drivers/video/fbdev/tridentfb.c
index f9c3b1d38fc2..7933e01aacc5 100644
--- a/drivers/video/fbdev/tridentfb.c
+++ b/drivers/video/fbdev/tridentfb.c
@@ -1475,7 +1475,7 @@ static int trident_pci_probe(struct pci_dev *dev,
if (err)
return err;
- err = pci_enable_device(dev);
+ err = pcim_enable_device(dev);
if (err)
return err;
@@ -1715,12 +1715,10 @@ static int trident_pci_probe(struct pci_dev *dev,
kfree(info->pixmap.addr);
if (info->screen_base)
iounmap(info->screen_base);
- release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
disable_mmio(info->par);
out_unmap1:
if (default_par->io_virt)
iounmap(default_par->io_virt);
- release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
framebuffer_release(info);
return err;
}
@@ -1735,8 +1733,6 @@ static void trident_pci_remove(struct pci_dev *dev)
i2c_del_adapter(&par->ddc_adapter);
iounmap(par->io_virt);
iounmap(info->screen_base);
- release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
- release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
kfree(info->pixmap.addr);
fb_dealloc_cmap(&info->cmap);
framebuffer_release(info);
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH -next] video: fbdev: tridentfb: Fix missing pci_disable_device() in probe and remove
2022-09-22 1:37 [PATCH -next] video: fbdev: tridentfb: Fix missing pci_disable_device() in probe and remove ruanjinjie
@ 2022-09-25 16:21 ` Helge Deller
2022-09-26 1:21 ` Ruan Jinjie
0 siblings, 1 reply; 3+ messages in thread
From: Helge Deller @ 2022-09-25 16:21 UTC (permalink / raw)
To: ruanjinjie, zheyuma97, javierm, wsa+renesas, tzimmermann,
linux-fbdev, dri-devel, linux-kernel
On 9/22/22 03:37, ruanjinjie wrote:
> Replace pci_enable_device() with pcim_enable_device(),
> pci_disable_device() and pci_release_regions() will be
> called in release automatically.
>
> Signed-off-by: ruanjinjie <ruanjinjie@huawei.com>
applied.
Thanks!
Helge
> ---
> drivers/video/fbdev/tridentfb.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/video/fbdev/tridentfb.c b/drivers/video/fbdev/tridentfb.c
> index f9c3b1d38fc2..7933e01aacc5 100644
> --- a/drivers/video/fbdev/tridentfb.c
> +++ b/drivers/video/fbdev/tridentfb.c
> @@ -1475,7 +1475,7 @@ static int trident_pci_probe(struct pci_dev *dev,
> if (err)
> return err;
>
> - err = pci_enable_device(dev);
> + err = pcim_enable_device(dev);
> if (err)
> return err;
>
> @@ -1715,12 +1715,10 @@ static int trident_pci_probe(struct pci_dev *dev,
> kfree(info->pixmap.addr);
> if (info->screen_base)
> iounmap(info->screen_base);
> - release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
> disable_mmio(info->par);
> out_unmap1:
> if (default_par->io_virt)
> iounmap(default_par->io_virt);
> - release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
> framebuffer_release(info);
> return err;
> }
> @@ -1735,8 +1733,6 @@ static void trident_pci_remove(struct pci_dev *dev)
> i2c_del_adapter(&par->ddc_adapter);
> iounmap(par->io_virt);
> iounmap(info->screen_base);
> - release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
> - release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
> kfree(info->pixmap.addr);
> fb_dealloc_cmap(&info->cmap);
> framebuffer_release(info);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] video: fbdev: tridentfb: Fix missing pci_disable_device() in probe and remove
2022-09-25 16:21 ` Helge Deller
@ 2022-09-26 1:21 ` Ruan Jinjie
0 siblings, 0 replies; 3+ messages in thread
From: Ruan Jinjie @ 2022-09-26 1:21 UTC (permalink / raw)
To: Helge Deller, zheyuma97, javierm, wsa+renesas, tzimmermann,
linux-fbdev, dri-devel, linux-kernel
Thank you very much!
On 2022/9/26 0:21, Helge Deller wrote:
> On 9/22/22 03:37, ruanjinjie wrote:
>> Replace pci_enable_device() with pcim_enable_device(),
>> pci_disable_device() and pci_release_regions() will be
>> called in release automatically.
>>
>> Signed-off-by: ruanjinjie <ruanjinjie@huawei.com>
>
> applied.
>
> Thanks!
> Helge
>
>> ---
>> drivers/video/fbdev/tridentfb.c | 6 +-----
>> 1 file changed, 1 insertion(+), 5 deletions(-)
>>
>> diff --git a/drivers/video/fbdev/tridentfb.c
>> b/drivers/video/fbdev/tridentfb.c
>> index f9c3b1d38fc2..7933e01aacc5 100644
>> --- a/drivers/video/fbdev/tridentfb.c
>> +++ b/drivers/video/fbdev/tridentfb.c
>> @@ -1475,7 +1475,7 @@ static int trident_pci_probe(struct pci_dev *dev,
>> if (err)
>> return err;
>>
>> - err = pci_enable_device(dev);
>> + err = pcim_enable_device(dev);
>> if (err)
>> return err;
>>
>> @@ -1715,12 +1715,10 @@ static int trident_pci_probe(struct pci_dev *dev,
>> kfree(info->pixmap.addr);
>> if (info->screen_base)
>> iounmap(info->screen_base);
>> - release_mem_region(tridentfb_fix.smem_start,
>> tridentfb_fix.smem_len);
>> disable_mmio(info->par);
>> out_unmap1:
>> if (default_par->io_virt)
>> iounmap(default_par->io_virt);
>> - release_mem_region(tridentfb_fix.mmio_start,
>> tridentfb_fix.mmio_len);
>> framebuffer_release(info);
>> return err;
>> }
>> @@ -1735,8 +1733,6 @@ static void trident_pci_remove(struct pci_dev *dev)
>> i2c_del_adapter(&par->ddc_adapter);
>> iounmap(par->io_virt);
>> iounmap(info->screen_base);
>> - release_mem_region(tridentfb_fix.smem_start,
>> tridentfb_fix.smem_len);
>> - release_mem_region(tridentfb_fix.mmio_start,
>> tridentfb_fix.mmio_len);
>> kfree(info->pixmap.addr);
>> fb_dealloc_cmap(&info->cmap);
>> framebuffer_release(info);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-26 1:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-22 1:37 [PATCH -next] video: fbdev: tridentfb: Fix missing pci_disable_device() in probe and remove ruanjinjie
2022-09-25 16:21 ` Helge Deller
2022-09-26 1:21 ` Ruan Jinjie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).