linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] video: fbdev: replacing of_node_put with __free(device_node)
@ 2024-04-23  1:20 Abdulrasaq Lawani
  2024-04-25 10:13 ` Helge Deller
  0 siblings, 1 reply; 2+ messages in thread
From: Abdulrasaq Lawani @ 2024-04-23  1:20 UTC (permalink / raw)
  To: deller, sam, tzimmermann, christophe.jaillet, u.kleine-koenig,
	julia.lawall
  Cc: Abdulrasaq Lawani, linux-fbdev, dri-devel, linux-kernel, skhan,
	javier.carrasco.cruz

Replaced instance of of_node_put with __free(device_node)
to simplify code and protect against any memory leaks
due to future changes in the control flow.

Suggested-by: Julia Lawall <julia.lawall@inria.fr>
Signed-off-by: Abdulrasaq Lawani <abdulrasaqolawani@gmail.com>
---
 drivers/video/fbdev/offb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c
index b421b46d88ef..ea38a260774b 100644
--- a/drivers/video/fbdev/offb.c
+++ b/drivers/video/fbdev/offb.c
@@ -357,7 +357,7 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp
 			par->cmap_type = cmap_gxt2000;
 	} else if (of_node_name_prefix(dp, "vga,Display-")) {
 		/* Look for AVIVO initialized by SLOF */
-		struct device_node *pciparent = of_get_parent(dp);
+		struct device_node *pciparent __free(device_node) = of_get_parent(dp);
 		const u32 *vid, *did;
 		vid = of_get_property(pciparent, "vendor-id", NULL);
 		did = of_get_property(pciparent, "device-id", NULL);
@@ -369,7 +369,6 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp
 			if (par->cmap_adr)
 				par->cmap_type = cmap_avivo;
 		}
-		of_node_put(pciparent);
 	} else if (dp && of_device_is_compatible(dp, "qemu,std-vga")) {
 #ifdef __BIG_ENDIAN
 		const __be32 io_of_addr[3] = { 0x01000000, 0x0, 0x0 };
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] video: fbdev: replacing of_node_put with __free(device_node)
  2024-04-23  1:20 [PATCH] video: fbdev: replacing of_node_put with __free(device_node) Abdulrasaq Lawani
@ 2024-04-25 10:13 ` Helge Deller
  0 siblings, 0 replies; 2+ messages in thread
From: Helge Deller @ 2024-04-25 10:13 UTC (permalink / raw)
  To: Abdulrasaq Lawani, sam, tzimmermann, christophe.jaillet,
	u.kleine-koenig, julia.lawall
  Cc: linux-fbdev, dri-devel, linux-kernel, skhan, javier.carrasco.cruz

On 4/23/24 03:20, Abdulrasaq Lawani wrote:
> Replaced instance of of_node_put with __free(device_node)
> to simplify code and protect against any memory leaks
> due to future changes in the control flow.
>
> Suggested-by: Julia Lawall <julia.lawall@inria.fr>
> Signed-off-by: Abdulrasaq Lawani <abdulrasaqolawani@gmail.com>

applied.
Thanks!

Helge

> ---
>   drivers/video/fbdev/offb.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c
> index b421b46d88ef..ea38a260774b 100644
> --- a/drivers/video/fbdev/offb.c
> +++ b/drivers/video/fbdev/offb.c
> @@ -357,7 +357,7 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp
>   			par->cmap_type = cmap_gxt2000;
>   	} else if (of_node_name_prefix(dp, "vga,Display-")) {
>   		/* Look for AVIVO initialized by SLOF */
> -		struct device_node *pciparent = of_get_parent(dp);
> +		struct device_node *pciparent __free(device_node) = of_get_parent(dp);
>   		const u32 *vid, *did;
>   		vid = of_get_property(pciparent, "vendor-id", NULL);
>   		did = of_get_property(pciparent, "device-id", NULL);
> @@ -369,7 +369,6 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp
>   			if (par->cmap_adr)
>   				par->cmap_type = cmap_avivo;
>   		}
> -		of_node_put(pciparent);
>   	} else if (dp && of_device_is_compatible(dp, "qemu,std-vga")) {
>   #ifdef __BIG_ENDIAN
>   		const __be32 io_of_addr[3] = { 0x01000000, 0x0, 0x0 };


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-04-25 10:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-23  1:20 [PATCH] video: fbdev: replacing of_node_put with __free(device_node) Abdulrasaq Lawani
2024-04-25 10:13 ` Helge Deller

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).