2005-01-30 20:39:46

by Jesper Juhl

Subject: [PATCH] remove unused label and obsolete preprocessor gunk from hisax

Here's a patch to remove an unused label and some obsolete preprocessor
magic around it. Thus killing this warning:
drivers/isdn/hisax/hisax_fcpcipnp.c:1014: warning: label `out_unregister_isapnp' defined but not used
Please apply.


Signed-off-by: Jesper Juhl <[email protected]>

--- linux-2.6.11-rc2-bk7-orig/drivers/isdn/hisax/hisax_fcpcipnp.c 2005-01-22 21:59:37.000000000 +0100
+++ linux-2.6.11-rc2-bk7/drivers/isdn/hisax/hisax_fcpcipnp.c 2005-01-30 20:04:00.000000000 +0100
@@ -1010,12 +1010,6 @@ static int __init hisax_fcpcipnp_init(vo
#endif
return 0;

-#if !defined(CONFIG_HOTPLUG) || defined(MODULE)
- out_unregister_isapnp:
-#ifdef __ISAPNP__
- pnp_unregister_driver(&fcpnp_driver);
-#endif
-#endif
out_unregister_pci:
pci_unregister_driver(&fcpci_driver);
out:

2005-01-30 22:34:53

by Karsten Keil

Subject: Re: [PATCH] remove unused label and obsolete preprocessor gunk from hisax

On Sun, Jan 30, 2005 at 09:43:05PM +0100, Jesper Juhl wrote:
>
>
> Here's a patch to remove an unused label and some obsolete preprocessor
> magic around it. Thus killing this warning:
> drivers/isdn/hisax/hisax_fcpcipnp.c:1014: warning: label `out_unregister_isapnp' defined but not used
> Please apply.
>

Agree.


Signed-off-by: Karsten Keil <[email protected]>
Signed-off-by: Jesper Juhl <[email protected]>

--- linux-2.6.11-rc2-bk7-orig/drivers/isdn/hisax/hisax_fcpcipnp.c 2005-01-22 21:59:37.000000000 +0100
+++ linux-2.6.11-rc2-bk7/drivers/isdn/hisax/hisax_fcpcipnp.c 2005-01-30 20:04:00.000000000 +0100
@@ -1010,12 +1010,6 @@ static int __init hisax_fcpcipnp_init(vo
#endif
return 0;

-#if !defined(CONFIG_HOTPLUG) || defined(MODULE)
- out_unregister_isapnp:
-#ifdef __ISAPNP__
- pnp_unregister_driver(&fcpnp_driver);
-#endif
-#endif
out_unregister_pci:
pci_unregister_driver(&fcpci_driver);
out:






--
Karsten Keil
SuSE Labs
ISDN development