macintosh/macio-adb: replace of_node_put() with __free
PATCH 1/1 macintosh/macio-adb: replace of_node_put() with __free
use the new cleanup magic to replace of_node_put() with __free(device_node) marking to auto release when they get out of scope.
Suggested-by Julia Lawall <[email protected]>
Signed-off-by sundar <[email protected]>
--- drivers/macintosh/macio-adb.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-)
drivers/macintosh/macio-adb.c +10 -14
@@ -83,35 +83,32 @@ struct adb_driver macio_adb_driver = {int macio_probe (void ) { -struct device_node *np; + struct device_node *np __free(device_node) = +of_find_compatible_node (NULL ,"adb" ,"chrp,adb0" ); - np =of_find_compatible_node (NULL ,"adb" ,"chrp,adb0" ); -if (np) { -of_node_put (np); +if (np)return 0 ; - } +return -ENODEV ; }int macio_init (void ) { -struct device_node *adbs; + struct device_node *adbs __free(device_node) = +of_find_compatible_node (NULL ,"adb" ,"chrp,adb0" );struct resource r;unsigned int irq; - adbs =of_find_compatible_node (NULL ,"adb" ,"chrp,adb0" );if (!adbs)return -ENXIO ; -if (of_address_to_resource (adbs,0 , &r)) { -of_node_put (adbs); +if (of_address_to_resource (adbs,0 , &r))return -ENXIO ; - } + adb =ioremap (r.start,sizeof (struct adb_regs )); -if (!adb) { -of_node_put (adbs); +if (!adb)return -ENOMEM ; - } +out_8 (&adb->ctrl.r,0 );out_8 (&adb->intr.r,0 );
@@ -121,7 +118,6 @@ int macio_init(void)out_8 (&adb->autopoll.r,APE ); irq =irq_of_parse_and_map (adbs,0 ); -of_node_put (adbs);if (request_irq (irq, macio_adb_interrupt,0 ,"ADB" , (void *)0 )) {iounmap (adb);printk (KERN_ERR "ADB: can't get irq %d\n" , irq);
Signature · 1 line
2.34.1
Michael Ellerman
AppliedQuoted 4 lines · sundar
use the new cleanup magic to replace
of_node_put()with__free(device_node)marking to auto release when they get out of scope.
Applied to powerpc/next.
[1/1] macintosh/macio-adb: replace of_node_put() with __free
https://git.kernel.org/powerpc/c/84030aacf127d000180fa3cb4b589d8ab1b0d46b
cheers