Skip to contentSkip to conversation

drivers/char/ip2: kill unused code, label

PATCH In review Jeff Garzik 2 participants 2 messages Oct 1, 2006 – Oct 2, 2006 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/char/ip2: kill unused code, label

Kill warning:

drivers/char/ip2/ip2main.c: In function ‘ip2_loadmain’:
drivers/char/ip2/ip2main.c:782: warning: label ‘out_class’ defined but not used

This driver's initialization (and cleanup of errors during init) is extremely convoluted, and could stand to be transformed into the standard unwinding-goto style of error cleanup.

drivers/char/ip2/ip2main.c +0 -2
index 331f447..bcf6573 100644
@@ -779,8 +779,6 @@ retry:
 	ip2trace (ITRC_NO_PORT, ITRC_INIT, ITRC_RETURN, 0 );
 	goto out;
 
-out_class:
-	class_destroy(ip2_class);
 out_chrdev:
 	unregister_chrdev(IP2_IPL_MAJOR, "ip2");
 out:
#1 lore raw
Quoted 10 lines · Jeff Garzik

Kill warning:

drivers/char/ip2/ip2main.c: In function ‘ip2_loadmain’:
drivers/char/ip2/ip2main.c:782: warning: label ‘out_class’ defined but not used

This driver's initialization (and cleanup of errors during init) is extremely convoluted, and could stand to be transformed into the standard unwinding-goto style of error cleanup.

Looks good to me. I'll look into the unwinding suggestion.

Quoted 13 lines
drivers/char/ip2/ip2main.c +0 -2
index 331f447..bcf6573 100644
@@ -779,8 +779,6 @@ retry:
 	ip2trace (ITRC_NO_PORT, ITRC_INIT, ITRC_RETURN, 0 );
 	goto out;
 
-out_class:
-	class_destroy(ip2_class);
 out_chrdev:
 	unregister_chrdev(IP2_IPL_MAJOR, "ip2");
 out:
Signature · 4 lines
Michael H. Warfield (AI4NB) | (770) 985-6132 |  [email protected]
   /\/\|=mhw=|\/\/          | (678) 463-0932 |  http://www.wittsend.com/mhw/
   NIC whois: MHW9          | An optimist believes we live in the best of all
 PGP Key: 0xDF1DD471        | possible worlds.  A pessimist is sure of it!